T4Practical1

src/main/java/com/stir/cscu9t4practical1/CycleEntry.java

@@ -0,0 +1,23 @@
+package com.stir.cscu9t4practical1;
+
+public class CycleEntry extends Entry{
+
+    private String terrain;
+    private String tempo;
+
+    public CycleEntry (String n, int d, int m, int y, int h, int min, int s, float dist, String terr, String tempo){
+        super(n,d, m, y, h, min, s, dist);
+        this.terrain = terr;
+        this.tempo = tempo;
+
+    }
+
+    public String getTerrain() { return terrain; }
+
+    public String getTempo() { return tempo; }
+
+    @Override
+    public String getEntry() {
+        return (getName() + " cycled " + getDistance() + " km in " + getHour() + ":" + getMin() + ":" + getSec() + " on " + getDay() + "/" + getMonth() + "/" + getYear() + " on " + getTerrain() + " at " + getTempo() + " tempo\n");
+    }
+}

src/main/java/com/stir/cscu9t4practical1/Entry.java

@@ -1,19 +1,18 @@
 // This class holds information about a single training session
 package com.stir.cscu9t4practical1;
 
-import java.util.Calendar;
-// Just testing
+import java.util.Calendar;
 public class Entry {
-  private String name;
-  private Calendar dateAndTime;
-  private float distance;
+  protected String name;
+  protected Calendar dateAndTime;
+  protected float distance;
 
   public Entry (String n, int d, int m, int y, int h, int min, int s, float dist) {
-    name = n;
+    this.name = n;
     Calendar inst = Calendar.getInstance();
     inst.set(y,m-1,d,h,min,s);
-    dateAndTime = inst;
-    distance = dist;
+    this.dateAndTime = inst;
+    this.distance = dist;
   } //constructor
 
   public String getName () {
@@ -50,7 +49,7 @@ public float getDistance () {
   } //getYear
 
   public String getEntry () {
-   String result = getName()+" ran " + getDistance() + " km in "
+   String result = getName()+" went " + getDistance() + " km in "
              +getHour()+":"+getMin()+":"+ getSec() + " on "
              +getDay()+"/"+getMonth()+"/"+getYear()+"\n";
    return result;

src/main/java/com/stir/cscu9t4practical1/SprintEntry.java

@@ -0,0 +1,25 @@
+package com.stir.cscu9t4practical1;
+import java.util.Calendar;
+
+public class SprintEntry extends Entry{
+
+    private int repetitions;
+    private float recovery;
+
+    public SprintEntry(String n, int d, int m, int y, int h, int min, int s, float dist, int reps, float recov) {
+
+        super(n,d, m, y, h, min, s, dist);
+        this.repetitions = reps;
+        this.recovery = recov;
+
+    }
+
+    public int getRepetitions() { return repetitions; }
+
+    public float getRecovery() { return recovery; }
+
+    @Override
+    public String getEntry() {
+        return (getName() + " sprinted " + getRepetitions() + "x" + getDistance() + "m in " + getHour() + ":" + getMin() + ":" + getSec() + " with " + getRecovery() + " minutes recovery on " + getDay() + "/" + getMonth() + "/" + getYear() +"\n");
+    }
+}

src/main/java/com/stir/cscu9t4practical1/SwimEntry.java

@@ -0,0 +1,25 @@
+package com.stir.cscu9t4practical1;
+import java.util.Calendar;
+
+public class SwimEntry extends Entry{
+    private String where;
+
+    public SwimEntry(String n, int d, int m, int y, int h, int min, int s, float dist, String where) {
+        super(n,d, m, y, h, min, s, dist);
+        this.where = where;
+    }
+
+    public String getWhere() {
+        if (where.equals("pool")) {
+            return "in a " + where;
+        }
+        else {
+            return where;
+        }
+    }
+
+    @Override
+    public String getEntry() {
+        return (getName() + " swam " + getDistance() + " km " + getWhere() + " in " + getHour() + ":" + getMin() + ":" + getSec() + " on " + getDay() + "/" + getMonth() + "/" + getYear() +"\n");
+    }
+}

src/main/java/com/stir/cscu9t4practical1/TrainingRecord.java

@@ -30,7 +30,35 @@ public String lookupEntry (int d, int m, int y) {
             }
        return result;
    } // lookupEntry
-
+
+    // look up the entry of a given day and month
+    public void RemoveEntry (int d, int m, int y, String n) {
+        ListIterator<Entry> iter = tr.listIterator();
+        String result = "No entries found";
+        while (iter.hasNext()) {
+            Entry current = iter.next();
+            if (current.getDay()==d && current.getMonth()==m && current.getYear()==y && current.getName().equals(n))
+                tr.remove(current.getEntry());
+        }
+    } // lookupEntry
+
+    // look up the entry of a given day and month
+    public LinkedList<String> lookUpEntries (int d, int m, int y) {
+        ListIterator<Entry> iter = tr.listIterator();
+        LinkedList<String> result = new LinkedList();
+//        result.set(i, "No entries found");
+        int i = 0;
+        while (iter.hasNext()) {
+            Entry current = iter.next();
+            if (current.getDay()==d && current.getMonth()==m && current.getYear()==y)
+                result.set(i, current.getEntry());
+            else
+                result.set(i, "No entries found.");
+            i++;
+        }
+        return result;
+    } // lookupEntry
+
    // Count the number of entries
    public int getNumberOfEntries(){
        return tr.size();
@@ -39,5 +67,22 @@ public int getNumberOfEntries(){
    public void clearAllEntries(){
        tr.clear();
    }
-
+
+   //public void RemoveEntry(Entry e) {tr.remove(e); }
+   //public int RemoveEntry(String name, int d, int m, int y) {
+   //        ListIterator<Entry> iter = tr.listIterator();
+   //        LinkedList<String> result = new LinkedList();
+//        result.set(i, "No entries found");
+   //        int i = 0;
+   //        while (iter.hasNext()) {
+   //            Entry current = iter.next();
+   //            if (current.getDay()==d && current.getMonth()==m && current.getYear()==y)
+   //                result.set(i, current.getEntry());
+   //            else
+   //                result.set(i, "No entries found.");
+   //            i++;
+   //        }
+   //        return result;
+   //}
+
 } // TrainingRecord