Changeset 163

Timestamp:

01/16/10 11:34:06 (2 years ago)

Author:

stefan

Message:

implemented feature #164: allow relative values (with prefix "+") in training programs (for time, pulse and power)

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• CHANGELOG (modified) (1 diff)
• src-test/org/jergometer/model/BikeProgramDataTest.java (modified) (1 diff)
• src/org/jergometer/model/BikeProgramData.java (modified) (4 diffs)

trunk/build.xml

@@ -136 +136 @@
 
   <!-- Validates the source code and creates a new release on the remote server. -->
-  <target name="create_remote_release" depends="compile">
+  <target name="create_remote_release" depends="compile,create_linux_source_package">
     <exec executable="scripts/create_remote_release">
       <arg value="${ant.project.name}-${program.version}.${build.number}"/>

trunk/CHANGELOG

@@ -2 +2 @@
 """"""""""""""""""""""""
 
-//== 0.7.4 ==
+//== 0.7.5 ==
+
+2010-01-16
+* [stefan]  * implemented feature #164: allow relative values (with prefix "+") in training programs (for time, pulse and power)
+
+== 0.7.4 ==
 
 2010-01-16

trunk/src-test/org/jergometer/model/BikeProgramDataTest.java

@@ -8 +8 @@
 public class BikeProgramDataTest extends TestCase {
   public void testTimeDefinitions() {
-    assertEquals(60, BikeProgramData.getTime("60"));
-    assertEquals(60, BikeProgramData.getTime("60s"));
-    assertEquals(60, BikeProgramData.getTime("1m"));
-    assertEquals(60, BikeProgramData.getTime("1'"));
-    assertEquals(60, BikeProgramData.getTime("1:0"));
-    assertEquals(60, BikeProgramData.getTime("1:00"));
-    assertEquals(60, BikeProgramData.getTime("1.0m"));
-    assertEquals(60, BikeProgramData.getTime("1,0m"));
-    assertEquals(90, BikeProgramData.getTime("1,5m"));
-    assertEquals(90, BikeProgramData.getTime("1m30"));
-    assertEquals(90, BikeProgramData.getTime("1m30s"));
-    assertEquals(90, BikeProgramData.getTime("01:30"));
-    assertEquals(90, BikeProgramData.getTime("0:01:30"));
-    assertEquals(90, BikeProgramData.getTime("0h01m30"));
-    assertEquals(3661, BikeProgramData.getTime("1:1:1"));
-    assertEquals(3661, BikeProgramData.getTime("1h1m1"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("60"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("60s"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("1m"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("1'"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("1:0"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("1:00"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("1.0m"));
+    assertEquals(60, BikeProgramData.GetTime.inst.apply("1,0m"));
+    assertEquals(90, BikeProgramData.GetTime.inst.apply("1,5m"));
+    assertEquals(90, BikeProgramData.GetTime.inst.apply("1m30"));
+    assertEquals(90, BikeProgramData.GetTime.inst.apply("1m30s"));
+    assertEquals(90, BikeProgramData.GetTime.inst.apply("01:30"));
+    assertEquals(90, BikeProgramData.GetTime.inst.apply("0:01:30"));
+    assertEquals(90, BikeProgramData.GetTime.inst.apply("0h01m30"));
+    assertEquals(3661, BikeProgramData.GetTime.inst.apply("1:1:1"));
+    assertEquals(3661, BikeProgramData.GetTime.inst.apply("1h1m1"));
   }
 }

trunk/src/org/jergometer/model/BikeProgramData.java

@@ -21 +21 @@
   public void fromXML(XMLElement rootElement) {
     name = rootElement.getAttribute("name");
-    duration = getTime(rootElement.getAttribute("duration"));
+    duration = getValue(GetTime.inst, rootElement.getAttribute("duration"), 0);
+
+    LastState lastState = new LastState();
 
     XMLElement timeEventsElement = rootElement.getChildElement("timeevents");
@@ -27 +29 @@
       for (XMLElement timeEventElement : timeEventsElement.getChildElements()) {
         if (timeEventElement.getName().equals("timeevent")) {
-          events.add(new TimeEvent(timeEventElement));
+          events.add(new TimeEvent(timeEventElement, lastState));
         }
       }
@@ -51 +53 @@
   }
 
-  public static int getTime(String timeString) {
-    timeString = timeString.replaceAll(",", ".");
-    String h = null, m = null, s = null;
-    if (timeString.indexOf(':') >= 0) {
-      String[] parts = timeString.split(":");
-      switch (parts.length) {
-        case 3:
+
+
+  private static int getValue(IntFunction1<String> f, String string, int lastValue) {
+    int sign = 0;
+
+    if (string.startsWith("+")) {
+      sign = 1;
+      string = string.substring(1);
+    } else
+    if (string.startsWith("-")) {
+      sign = -1;
+      string = string.substring(1);
+    }
+
+    if (sign == 0) {
+      return f.apply(string);
+    } else {
+      return lastValue + sign * f.apply(string);
+    }
+  }
+  
+
+
+  public static interface IntFunction1<T> {
+    public int apply(String s);
+  }
+
+  public static class GetTime implements IntFunction1<String> {
+    public static final GetTime inst = new GetTime();
+
+    public int apply(String timeString) {
+      timeString = timeString.replaceAll(",", ".");
+      String h = null, m = null, s = null;
+      if (timeString.indexOf(':') >= 0) {
+        String[] parts = timeString.split(":");
+        switch (parts.length) {
+          case 3:
+            h = parts[0];
+            m = parts[1];
+            s = parts[2];
+            break;
+            case 2:
+              m = parts[0];
+              s = parts[1];
+              break;
+            case 1:
+              s = parts[0];
+        }
+      } else {
+        if (timeString.indexOf('h') >= 0) {
+          String[] parts = timeString.split("h");
           h = parts[0];
-          m = parts[1];
-          s = parts[2];
-          break;
-          case 2:
-            m = parts[0];
-            s = parts[1];
-            break;
-          case 1:
-            s = parts[0];
-      }
-    } else {
-      if (timeString.indexOf('h') >= 0) {
-        String[] parts = timeString.split("h");
-        h = parts[0];
+            timeString = parts.length == 2 ? parts[1] : "0";
+        }
+        if (timeString.indexOf('m') >= 0) {
+          String[] parts = timeString.split("m");
+          m = parts[0];
           timeString = parts.length == 2 ? parts[1] : "0";
-      }
-      if (timeString.indexOf('m') >= 0) {
-        String[] parts = timeString.split("m");
-        m = parts[0];
-        timeString = parts.length == 2 ? parts[1] : "0";
-      }
-      if (timeString.indexOf('\'') >= 0) {
-        String[] parts = timeString.split("'");
-        m = parts[0];
-        timeString = parts.length == 2 ? parts[1] : "0";
-      }
-      s = timeString.replace("s", "");
-    }
-
+        }
+        if (timeString.indexOf('\'') >= 0) {
+          String[] parts = timeString.split("'");
+          m = parts[0];
+          timeString = parts.length == 2 ? parts[1] : "0";
+        }
+        s = timeString.replace("s", "");
+      }
+
+      int time = 0;
+      if (h != null) {
+        time += (int) (3600 * Double.parseDouble(h));
+      }
+      if (m != null) {
+        time += (int) (60 * Double.parseDouble(m));
+      }
+      if (s != null) {
+        time += Integer.parseInt(s);
+      }
+
+      return time;
+    }
+  }
+  public static class GetInt implements IntFunction1<String> {
+    public static final GetInt inst = new GetInt();
+
+    public int apply(String s) {
+      return Integer.parseInt(s);
+    }
+  }
+
+
+
+  // inner classes
+  private class LastState {
     int time = 0;
-    if (h != null) {
-      time += (int) (3600 * Double.parseDouble(h));
-    }
-    if (m != null) {
-      time += (int) (60 * Double.parseDouble(m));
-    }
-    if (s != null) {
-      time += Integer.parseInt(s);
-    }
-
-    return time;
-  }
-
-
-  // inner classes
+    int power = 0;
+    int pulse = 0;
+
+    public int getLast(Action.Type type) {
+      switch (type) {
+        case power:
+          return power;
+        case pulse:
+          return pulse;
+      }
+      return -1;
+    }
+
+    public void setLast(Action.Type type, int value) {
+      switch (type) {
+        case power:
+          power = value;
+          return;
+        case pulse:
+          pulse = value;
+      }
+    }
+  }
+
   public static class TimeEvent {
     protected int time;
     protected ArrayList<Action> actions = new ArrayList<Action>();
 
-    public TimeEvent(XMLElement element) {
-      fromXML(element);
-    }
-
-    public void fromXML(XMLElement element) {
-      String timeString = element.getAttribute("time");
-      time = BikeProgramData.getTime(timeString);
+    public TimeEvent(XMLElement element, LastState lastState) {
+      fromXML(element, lastState);
+    }
+
+    public void fromXML(XMLElement element, LastState lastState) {
+      time = BikeProgramData.getValue(GetTime.inst, element.getAttribute("time"), lastState.time);
+      lastState.time = time;
 
       for (XMLElement actionElement : element.getChildElements()) {
         if(actionElement.getName().equals("action")) {
-          actions.add(new Action(actionElement));
+          actions.add(new Action(actionElement, lastState));
         }
       }
@@ -144 +211 @@
     }
 
-    public Action(XMLElement element) {
-      fromXML(element);
-    }
-
-    public void fromXML(XMLElement element) {
+    public Action(XMLElement element, LastState lastState) {
+      fromXML(element, lastState);
+    }
+
+    public void fromXML(XMLElement element, LastState lastState) {
       type = Type.valueOf(element.getAttribute("type"));
-      value = Integer.parseInt(element.getAttribute("value"));
+      value = BikeProgramData.getValue(GetInt.inst, element.getAttribute("value"), lastState.getLast(type));
+      lastState.setLast(type, value);
     }