exstore +- with carry

1 files changed, 24 insertions, 14 deletions

diff --git a/ReckonPrimer.activity/exstore.py b/ReckonPrimer.activity/exstore.py
index b524fd7..d5b2749 100644
--- a/ReckonPrimer.activity/exstore.py
+++ b/ReckonPrimer.activity/exstore.py
@@ -184,51 +184,60 @@ class ExStore:
         #works as _sett['input=']=[1,3,5]?!?
         _sett['title'] = '.+.=_ im Zahlenraum 5'
         _c1c3c1t1 = Task(copy.deepcopy(_sett), [])
-
         _sett['input='] = [1,3,5]; _sett['title'] = '_+_=_ im Zahlenraum 5'
         _c1c3c1t2 = Task(copy.deepcopy(_sett), [])
-
         _sett['_=_+_'] = True; _sett['title'] = '_+_=_ und _=_+_'
         _c1c3c1t3 = Task(copy.deepcopy(_sett), [])
-
         _sett['+'] = False; _sett['-'] = True;  _sett['input='] = [5]
         _sett['_=_+_'] = False; _sett['title'] = '.-.=_ im Zahlenraum 5'
         _c1c3c1t4 = Task(copy.deepcopy(_sett), [])
-
         _sett['input='] = [1,3,5]; _sett['title'] = '_-_=_ im Zahlenraum 5'
         _c1c3c1t5 = Task(copy.deepcopy(_sett), [])
-
         _sett['_=_+_'] = True; _sett['title'] = '_-_=_ und _=_-_'
         _c1c3c1t6 = Task(copy.deepcopy(_sett), [])
-
         _sett['+'] = True; _sett['title'] = 'Alles im Zahlenraum 5'
         _c1c3c1t7 = Task(copy.deepcopy(_sett), [])
-
         _sett['max'] = 9; _sett['title'] = 'Alles im Zahlenraum 10'
         _c1c3c1t8 = Task(copy.deepcopy(_sett), [])
-####### _c1c3c1 ############################################################
+####### _c1c3c2 ############################################################
         _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;
+         'calclines'    : 2,    # or 2 iff 'newline' : True.
+         'MAX'          : 50,  # 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
+         'min'          : 0,    # +: minimum in size of number in left argument
+         'max'          : 9,    # +: 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
+         'shuffle_inner': True,# shuffle only 1st (inner) iteration
          'cut-max'      : True  # cut set of all calcs down to MAX
         }
+        _sett['title'] = '.+_=. mit Zwischenschritt';
+        _c1c3c2t1 = Task(copy.deepcopy(_sett), [])
+
+        _sett['shuffle_all'] = True; 
+        _sett['title'] = '.+_=. mit Zwischenschritt @';
+        _c1c3c2t2 = Task(copy.deepcopy(_sett), [])
+
+        _sett['newline'] = False; _sett['title'] = '.+_=. ohne Zwischeschritt';
+        _c1c3c2t3 = Task(copy.deepcopy(_sett), [])
+
+        _sett['input'] = [3,5]; _sett['title'] = '.+_=_';
+        _c1c3c2t4 = Task(copy.deepcopy(_sett), [])
 
+        _sett['+'] = False;  _sett['-'] = True; _sett['title'] = '.-_=_';
+        _c1c3c2t5 = Task(copy.deepcopy(_sett), [])
 
+        _sett['+'] =True; _sett['title'] = '+ und -';
+        _c1c3c2t6 = Task(copy.deepcopy(_sett), [])
 ####### _c2 ##################################################################
 ####### _c3 ##################################################################
         _c3t1 = Task({'topic' : 'addsub_simp',
@@ -379,7 +388,8 @@ Collection("root = invisible node","required by tree structure", None,
                 ]),
         Collection('mit Zehner"uberschreitung',                  #_c1c3c2
                         " ", None, 
-                [
+                [_c1c3c2t1, _c1c3c2t2, _c1c3c2t3, _c1c3c2t4, 
+                 _c1c3c2t5, _c1c3c2t6
                 ])
         ])
      ]),