From 19e61c4fb258ed4ad483883e6f705a4fa6c81c5c Mon Sep 17 00:00:00 2001
From: cba56 <cba56@172.19.20.69>
Date: Thu, 22 Aug 2024 12:24:15 +0200
Subject: [PATCH] new program

---
 .DS_Store                                     | Bin 18436 -> 18436 bytes
 bookExamples/.DS_Store                        | Bin 18436 -> 18436 bytes
 bookExamples/patterns/.DS_Store               | Bin 30724 -> 34820 bytes
 .../patterns/loops/loops-program-swim.py      |  12 +++-----
 swiML.xpr                                     |  26 ++++++++++++++++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 74a6fe7e4075e363ab2ed923474f8139097727a3..100ac3442524cbb66b16e6b3a58ceb0a0120c866 100644
GIT binary patch
delta 1151
zcmeIwPe_w-9LMqR`zhPA8MfG*4w?>Uq;9RTMs&#BRwz=GZW4_MTlNGiU4)wb#fug6
zclINR{y-fHtcYxf>JV9{f-Zpt6&X=c9rIEYMo$yEhIhY*&*6J~@gB%AkmL5wMJna!
zwS>a~Z)90Wy>LX;?4Vo4YC`-_gMMd;E7@k-urbrIE1S&hH`L{txTD=}@9j1cMrXPw
zv&UGS?lHR6NLi`X7Y#|_)V$i*toh{fiP{GGt<I_MzeRL$OO-@qg|tXYwn?9ykh3x*
zSLK%6mxuCHp36&lC9ma;e3Vb}S-!|O`6<6-Qhrm6lTut%;U_?lB}AxaB~fBDvYr+a
zBuTNA4h&-3$<oJO4sejeoZ>WtoZ$-Bxxr2DGRh+!GsauSdB;~Kv?9%->6%ruX%4Mi
zbE{^5C3TA60=2u^TjFVKvNcavBp8_JH$|*=8FQ7DyJK;W$FAF-=(_HU)=kN@Wz${8
zG_Z!{j@*+`d1hjb%LkL_JHj01nlu%7@lnk}lP5%&r6$pudKyfjIICF8I#a3DblSvb
z+Sx*y9dy!FpxRfUI>Zr<a*X4gWQcQ|=K>eG#I?U{>iyzM9^?sHwR~}?Nmt3`6*Ixi
P1oQu3inP2XI%)X>r>+aj

delta 757
zcmeIw%S)7D7>4opdQl7+JVYus>L}sNH_R9_-{3HLAQwiX;v&c_R~`^MjHs1vq9mOH
zB}{uNY9Ubux)G`m+8BW=Z4<Z@AyU*u9&(p1f?oX}+PQpozw72nj*}ec!!4gks6WTH
zqru{EBz8Yod@pRr%n>cOr7#?kOkcj#SRwvMpOr_Gw3UoVy1!ayO*{4e^GL{hW^h)0
zR`Y5>EvaSoL;X~%YE5maZMCa@t9?L|LMkV5Q$QhpY$B8srIK1MaFIBTT%nn3w9v{8
zZjzvzejYH$5W_s-1uuEUYi9V!Cmg=Az#`vRVV#X!HreAqyL5)m)LA-PpVl62NnOB$
zUtGQdSK`h<Z+oJrT`Aow6M;P9rsJ`=OS@z&IBHtNT~=aJ&UI#RiXyyN1PD@QkTEI@
zwCV_2M?DQ(HrT62*bX}B;<_Q<=B@z`81O>_PV$H`o-)BRo-@fC-tvwq-ZN|XbMoEm
i;me`SDLT7@lOBqnkV}^5c;v%x_#Y$x!bz+7oAwWs=)bW5

diff --git a/bookExamples/.DS_Store b/bookExamples/.DS_Store
index 709539a76f69d048dd00c3b4892fe050c4d7f389..52f227e443c4d593359929d975c80d02b05585cb 100644
GIT binary patch
delta 52
zcmZpfz}PZ@af5}%<Rpbs5fd|G9R&-sS{;RILjw~_9R+hk)5)(Dj3+zm2ySN6WM$vX
IW$;TJ0GI3z`v3p{

delta 49
zcmZpfz}PZ@af5}%<X7UQqDDq$Itqry7PUGG)rLkEK#rNI(c}^d<IP_*#Mn1;8~hXp
E0Di0w6#xJL

diff --git a/bookExamples/patterns/.DS_Store b/bookExamples/patterns/.DS_Store
index 40276c8891991dbde04b23a20a0829842f6214fb..8bb8a159047d7bbab4b7e284c0834d421808c083 100644
GIT binary patch
delta 473
zcmZXQO)mpc6o&7a@lly!CW4TuwuFV+R3xI($izp8AeAQKvnd9xHl3<bk*HW$SYdKD
zHX2fYK#rXS3u0LoHoEW^B>sR~A1n9dx$jxr^WHb-@B<D{1t((+2DXhZ#twMv;FMIA
z8B58wvm0iwgSQIQ(u^@6VvX8{PV<3e^;ODC9u*{1qYc#RYgBCO1!{0fcj3dv6B@ck
zUj3?4PHbfcmlNhPW1<UNrt0zBe+OAw?3;$_1!KutoiL5qT5Q$8&HhgG%%6$9f*<z-
zZf%UmC}#;~@=CESZj|~l5_a*@TSsq!3_upA`n7*Xd6D1-^{^Wr^Y<fQTRBkic+y1;
z<NG3>#9K)T79`tBLp4RhJAi=|jh^G}A}Nv1GQ1q}l6xWzRG3!EZ7YdBtBj;*PQVp^
zlbQ*olL<4q&f@{6;@h}5>Jg!mit|STIIz!fVXmd;pHW8@AK>Re;@9xsmKpQ#ZTmPn
sC&-D&*PHJmD%MQ%QRzMZ=k!-Ee)YbjxMyVrErf+R!eVIdJHRJ=0bt~ZC;$Ke

delta 292
zcmZpfz|``AQHFtmfzhcn#gKua0LbJ3Vh}CB!@!WiJyFJ(F??gdZhl72$v(nrn`1=Q
zb8l?WVp+_sAi&5oS)f2{vyy=X|Kwy#$;n<aI~e&lzjHXmKDpZO(`5btxy@6IWSKYf
z2h3!iSW?a?Jb7J+(&WAb?#Z)7_HN!7@`7u#NLee>X8wc{#)&m1K)nZ2^jId(s*u~v
zBjCh5Sv^{Laz(WJW|o4bOp`x4NKe*sIL^p6d1<gJBm3rtL}zA34xpP}G47b`D5$Ih
zbTTIp13>{dkZ^_hfPp~)=o14Vb^zi4AWq=kSa_d#GJi`1Zv|Kbl$e~))4KV1(jP`-
Fa{*DlP8t9J

diff --git a/bookExamples/patterns/loops/loops-program-swim.py b/bookExamples/patterns/loops/loops-program-swim.py
index c4c85e5f..ea85f358 100644
--- 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
index 9a6b8304..5e8a273a 100644
--- 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>