exstore +- no carry

2 files changed, 33 insertions, 9 deletions

diff --git a/ReckonPrimer.activity/exercises/exaddsimp.py b/ReckonPrimer.activity/exercises/exaddsimp.py
index 079ce02..d9e83d1 100644
--- a/ReckonPrimer.activity/exercises/exaddsimp.py
+++ b/ReckonPrimer.activity/exercises/exaddsimp.py
@@ -227,7 +227,7 @@ class ExAddSimp(Exercise):
 
         # Buttons 9 .. 0
         self.number_butts = []
-        for i in range(0,9+1):
+        for i in range(0,10+1):
             self.toggle = gtk.ToggleButton(str(i))
             self.toggle_label = self.toggle.get_child()
             self.toggle_label.modify_font(pango.FontDescription("sans %d" % style.zoom(12)))
diff --git a/ReckonPrimer.activity/exstore.py b/ReckonPrimer.activity/exstore.py
index 4a66561..b524fd7 100644
--- a/ReckonPrimer.activity/exstore.py
+++ b/ReckonPrimer.activity/exstore.py
@@ -157,32 +157,55 @@ 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 ############################################################
+####### _c1c3 ################################################################
+####### _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.
+         'MAX'      : 50,     # 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
+         'max'      : 5,     # 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
+         '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
+         '=input'   : [1,3,5],    # analogous to '_+_=_'
+         'shuffle'  : True,  # shuffle _all_ the calcs
          'cut-max'  : True    # cut set of all calcs down to MAX
         }
+        #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 ############################################################
         _sett = {'topic'   : 'passten',
          'title'        : 'Template: + - with carry',
@@ -348,10 +371,11 @@ Collection("root = invisible node","required by tree structure", None,
              ])
         ]),
       Collection('"Ubungen + und - ',                            #_c1c3
-                 " ", None, 
+                 'Dieser Teil weicht von den Vereinbarungen ab, weil die "Ubungsklassen nicht entsprechend erweitert wurden.', None, 
         [Collection('ohne Zehner"uberschreitung',                #_c1c3c1
                         " ", None, 
-                [
+                [_c1c3c1t1, _c1c3c1t2, _c1c3c1t3, _c1c3c1t4,
+                 _c1c3c1t5, _c1c3c1t6, _c1c3c1t7, _c1c3c1t8
                 ]),
         Collection('mit Zehner"uberschreitung',                  #_c1c3c2
                         " ", None,