exstore +-

1 files changed, 57 insertions, 4 deletions

diff --git a/ReckonPrimer.activity/exstore.py b/ReckonPrimer.activity/exstore.py
index 1f1bce1..4a66561 100644
--- a/ReckonPrimer.activity/exstore.py
+++ b/ReckonPrimer.activity/exstore.py
@@ -157,7 +157,53 @@ class ExStore:
         _c1c2c2c2t3 = Task(copy.deepcopy(_sett), [])
         _sett['factors'] = [3,6,9]; _sett['title'] = '3,6,9-er Reihe'
         _c1c2c2c2t4 = Task(copy.deepcopy(_sett), [])
+####### _c1c3c1 ############################################################
+        _sett = {'topic' : 'addsub_simp',
+         'title'    : 'Template: + - within 10',
+         'descript' : 'settings: range of result, input at 3 positions, swap around =',
+         'icon'     : None,   # for quick reference of the exercise      
+         'calclines': 1,      # no. of lines for calc to be input.
+         'MAX'      : 100,    # maximum of calcs generated.
+                              # Generate fills up by varying input.
+         'MIN'      : 20,     # minimum of calcs generated UNUSED
+         'min'      : 0,      # minimum in size of a number in a calc
+         'max'      : 1,      # maximum  in size of a number in a calc
+                              # 0 <= min <= max <= 10
+         '+'        : True,   # make all additions min..max
+         '-'        : False,   # make all subtactions min..max
+         '_+_=_'    : True,   # = is _right_ from operator, e.g. 1+2=3
+         'input='   : [5],# list of positions in calc: 1 | 3 | 5
+                              # where input is possible;
+                              # actual positions chosen by Generate.
+         '_=_+_'    : False,  # = is _left_ from operator, e.g. 3=1+2
+         '=input'   : [1,3,5],# analogous to '_+_=_'
+         'shuffle'  : False,  # shuffle _all_ the calcs
+         'cut-max'  : True    # cut set of all calcs down to MAX
+        }
+
+
 
+####### _c1c3c1 ############################################################
+        _sett = {'topic'   : 'passten',
+         'title'        : 'Template: + - with carry',
+         'descript'     : 'settings: range of 1st operand, input left and right from =, input intermediate result, separate shuffling of operands.',
+         'icon'         : None, # for quick reference of the exercise      
+         'calclines'    : 1,    # or 2 iff 'newline' : True.
+         'MAX'          : 150,  # maximum of calcs generated;
+                                # TODO: Generate fills up by varying input.
+         'MIN'          : 10,   # minimum of calcs generated 090416WN:UNUSED
+         '+'            :True,  # + crossing the ten barrier!!
+         '-'            :False, # - goes below the ten barrier!!!
+                                #(i.e. iteration on left arg. is "outer" loop)
+         'min'          : 2,    # +: minimum in size of number in left argument
+         'max'          : 2,    # +: maximum in size of number in left argument
+         'input'        :[3],   # list of positions in calc 3 | 5
+                                # where input is possible.
+         'newline'      : True, # display 2nd line for intermediate results
+         'shuffle_all'  : False,# shuffle all calcs  
+         'shuffle_inner': False,# shuffle only 1st (inner) iteration
+         'cut-max'      : True  # cut set of all calcs down to MAX
+        }
 
 
 ####### _c2 ##################################################################
@@ -258,7 +304,7 @@ Collection("root = invisible node","required by tree structure", None,
   [Collection("Praxis Volksschule PHSt",                         #_c1
               "Rechenuebungen fuer die 1. und 2.Klasse, festgelegt am 16.Dez.09 mit Nina Jaklitsch und Arndt Stoeckl .", 
               None, 
-     [Collection("Uebungen . und 'in' ",                         #_c1c1
+     [Collection('"Ubungen . und "in" ',                        #_c1c1
                  " ", None, 
         [Collection("Einzelne Reihen . und 'in'",                #_c1c1c1 
                     " ", None, 
@@ -274,7 +320,7 @@ Collection("root = invisible node","required by tree structure", None,
            [_c1c1c3t1, _c1c1c3t2, _c1c1c3t3
            ])
         ]),                             
-      Collection("Uebungen :",                                   #_c1c2
+      Collection('"Ubungen :',                                  #_c1c2
                  " ", None, 
         [Collection(": ohne Rest",                               #_c1c2c1
                     " ", None, 
@@ -301,9 +347,16 @@ Collection("root = invisible node","required by tree structure", None,
                 ])
              ])
         ]),
-      Collection("Uebungen + und - ",                            #_c1c3
+      Collection('"Ubungen + und - ',                            #_c1c3
                  " ", None, 
-        [
+        [Collection('ohne Zehner"uberschreitung',                #_c1c3c1
+                        " ", None, 
+                [
+                ]),
+        Collection('mit Zehner"uberschreitung',                  #_c1c3c2
+                        " ", None, 
+                [
+                ])
         ])
      ]),
    Collection("Mini course",       #_c2