Add instructions to readme

vladmm · Apr 9, 2019 · 91ced44 · 91ced44
2 parents 57acc70 + 958c0b1
commit 91ced44
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -1,54 +1,15 @@
 # Internship 2019
 
-<h1>Bring me the money</h1>
+<h2>Instructions</h2>
 
-**Given a user situated in location A, and 4 ATMS such that:**
-1. The distance from userA to each ATM is:
-    1. 5m to ATM 1
-    2. 1h to ATM2
-    3. 30m to ATM3
-    4. 45m to ATM4
-2. The distance between ATMs is:
-    1. From ATM 1 -> ATM 2: 40m
-    3. FROM ATM 1 -> ATM 4: 45m
-    4. FROM ATM 2 -> ATM 3: 15m
-    5. FROM ATM 3 -> ATM 1: 40m
-    6. FROM ATM 3 -> ATM 4: 15m
-    7. FROM ATM 4 -> ATM 2: 30m
+1. Fork [this repository](https://github.com/Coera/internship2019) with the internship subjects from Coera to your account. 
+For more details on what a fork is and how to do it check [this link](https://help.github.com/en/articles/fork-a-repo).
+2. Clone the forked repository from your Github account as described in [this link](https://help.github.com/en/articles/cloning-a-repository).
+3. Go to [subjects](https://github.com/Coera/internship2019/tree/master/subjects) folder and read carefully the instructions for the subject allocated to you.
+4. Write an application as specified in the subject requirements.
+5. Commit & push the code to your forked repository.
+6. Create a Pull Request from your repository to the original one (from where your forked it).
+More details [here](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork).
 
-3. Each ATM has the same amount of money (5k), and:
-
-    | ATM Name | Opening time | Closing time |
-    |----------|--------------|--------------|
-    | ATM 1    | 12:00        | 18:00        |
-    | ATM 2    | 10:00        | 17:00        |
-    | ATM 3    | 22:00        | 12:00        |
-    | ATM 4    | 17:00        | 01:00        |
-
-4. User has 3 credit cards:
-
-    | Credit card | Fee  | Withdraw limit | Expiration date| Available Amount |
-    |-------------|------|----------------|----------------|------------------|
-    | SILVER      | 0.2% | 2k             | 23.05.2020     | 20k              |
-    | GOLD        | 0.1% | 3k             | 15.08.2018     | 25k              |
-    | PLATINUM    | 0%   | 4k             | 20.03.2019     | 3k               |
-
-5. Current date and time is: *19th March, 2019 - 11:30*
-
-**Please write an application using Java/C# that:**
-1. Determines what ATMs the user needs to use in order to withdraw 7.5k amount until 14:00 time with smallest fee available,
-using only valid credit cards (that are not expired at the current date),
-without passing through the same location twice.
-Processing time for each ATM is negligible.
-
-The application should implement the following method:
-
-    public List<Atm> getAtmsRoute() {
-        // TODO: add your code here
-    }
-
-
-**Note:**
-
-*All dates are in the same timezone.*
 
+For a complete list of GIT instructions and commands check [this link](https://git-scm.com/docs).
diff --git a/subjects/README.md b/subjects/README.md
@@ -0,0 +1,56 @@
+# Internship 2019 subjects
+
+**Given a user situated in location A, and 4 ATMS such that:**
+1. The walking time between starting point and ATMs as well as between each ATMs is presented below:
+
+    | From                 | To           | Duration (minutes) |
+    |----------------------|--------------|--------------------|
+    | User starting point  | ATM 1        | 5                  |
+    | User starting point  | ATM 2        | 60                 |
+    | User starting point  | ATM 3        | 30                 |
+    | User starting point  | ATM 4        | 45                 |
+    | ATM 1                | ATM 2        | 40                 |
+    | ATM 1                | ATM 4        | 45                 |
+    | ATM 2                | ATM 3        | 15                 |
+    | ATM 3                | ATM 1        | 40                 |
+    | ATM 3                | ATM 4        | 15                 |
+    | ATM 4                | ATM 2        | 30                 |
+
+2. Each ATM has the same amount of money equal with 5000 lei, and the following schedule:
+
+    | ATM Name | Opening time | Closing time |
+    |----------|--------------|--------------|
+    | ATM 1    | 12:00        | 18:00        |
+    | ATM 2    | 10:00        | 17:00        |
+    | ATM 3    | 22:00        | 12:00        |
+    | ATM 4    | 17:00        | 01:00        |
+
+3. User has 3 credit cards with the following properties:
+
+    | Credit card | Fee  | Withdraw limit (lei) / day  | Expiration date| Available Amount (lei)|
+    |-------------|------|-----------------------------|----------------|-----------------------|
+    | SILVER      | 0.2% | 4500                        | 23.05.2020     | 20000                 |
+    | GOLD        | 0.1% | 3000                        | 15.08.2018     | 25000                 |
+    | PLATINUM    | 0%   | 4000                        | 20.03.2019     | 3000                  |
+
+4. Current date and time is: *19th March, 2019 - 11:30*
+
+**Please write an application using either Java or C# programming language in order to:**
+1. <h5>Subject code = _INT01_ </h5>
+ Determine what ATMs and in which order the user needs to access for withdrawing 7500 lei until 19th March, 2019 - 14:00, with smallest fee available,
+using only valid credit cards (that are not expired at the current date),
+without passing through the same location twice.
+Processing time for each ATM is negligible.
+
+The application should implement the following method:
+
+    public List<Atm> getAtmsRoute() {
+        // TODO: add your code here
+    }
+
+
+
+**Note:**
+
+1. *All dates are in the same timezone.*
+2. *Only specified constraints are to be taken in consideration.*