new program

bartneck · Aug 22, 2024 · 19e61c4 · 19e61c4
1 parent 41e5545
commit 19e61c4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/bookExamples/.DS_Store b/bookExamples/.DS_Store
diff --git a/bookExamples/patterns/.DS_Store b/bookExamples/patterns/.DS_Store
diff --git a/bookExamples/patterns/loops/loops-program-swim.py b/bookExamples/patterns/loops/loops-program-swim.py
@@ -14,7 +14,8 @@ def nested_loop():
                 length=('lengthAsDistance',100),
                 stroke=('standardStroke','freestyle'),
                 rest=('sinceStart',"PT1M"+str((40+(j*5)))+"S"),
-                intensity=('startIntensity',('percentageEffort',(100-(10*nr_inner_loops))+(j*10)))
+                intensity=('startIntensity',('percentageEffort',
+                    (100-(10*nr_inner_loops))+(j*10)))
             ))
             instruction_list.append(swiML.Instruction(
                 length=('lengthAsDistance',(j+1)*25),
@@ -33,17 +34,12 @@ def write_program():
         stroke=('standardStroke','any'),
         intensity=('startIntensity',('zone','easy')),
     )
-    # warm down instruction
-    warmDown=swiML.Instruction(
-        length=('lengthAsDistance',400),
-        stroke=('standardStroke','any'),
-        intensity=('startIntensity',('zone','easy')),
-    )
+
     # assembly of the main instructions
     myInstructions=[swiML.SegmentName('Warm Up'),warmUp]
     myInstructions.append(swiML.SegmentName('Nested Loop'))
     myInstructions.extend(nested_loop())
-    myInstructions.extend([swiML.SegmentName('Warm down'),warmDown])
+    myInstructions.extend([swiML.SegmentName('Warm down'),warmUp])
 
     # create the program
     simpleProgram=swiML.Program(

diff --git a/swiML.xpr b/swiML.xpr
@@ -12,6 +12,26 @@
                     <entry>
                         <String>scenario.associations</String>
                         <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>bookExamples/loops-program-swim.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>swiMLXSL latest</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>bookExamples/patterns/loops/loops-program-swim.xml</String>
@@ -34,7 +54,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>bookExamples/patterns/loops/loops-program-intro.xml</String>
+                                    <String>bookExamples/patterns/handshake/handshake-program-intro.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -54,7 +74,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>bookExamples/patterns/handshake/handshake-program.xml</String>
+                                    <String>bookExamples/patterns/loops/loops-program-intro.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -74,7 +94,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>bookExamples/patterns/handshake/handshake-program-intro.xml</String>
+                                    <String>bookExamples/patterns/handshake/handshake-program.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>