removed all Ex*._sett, since they are inserted from settings

4 files changed, 75 insertions, 72 deletions

diff --git a/ReckonPrimer.activity/exaddsimp.py b/ReckonPrimer.activity/exaddsimp.py
index 95b94a1..194ad8e 100755
--- a/ReckonPrimer.activity/exaddsimp.py
+++ b/ReckonPrimer.activity/exaddsimp.py
@@ -15,29 +15,30 @@ from functions import *
 class ExAddSimp(Exercise):
     def __init__(self, dis, sett):
         self._display = dis
-        self._sett = {'topic'  : 'addsub_simp',
-         'title' : 'template exaddsimp',
-         'descript': 'addition and subtraction without carry, \
-                            i.e. without passing the 10 barrier. ',
-         'icon' : None,     # for quick reference of the exercise      
-         'calclines': 1,    # no. of lines for calc to be input.
-         'MAX'    : 30,     # 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
-         '-'      : True,   # make all subtactions min..max
-         '_+_=_'  : True,   # = is _right_ from operator, e.g. 1+2=3
-         'input=' : [1,3,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': True,   # shuffle _all_ the calcs
-         'cut-max': True    # cut set of all calcs down to MAX
-        }
+        self._sett = sett
+#        {'topic'  : 'addsub_simp',
+#         'title' : 'template exaddsimp',
+#         'descript': 'addition and subtraction without carry, \
+#                            i.e. without passing the 10 barrier. ',
+#         'icon' : None,     # for quick reference of the exercise      
+#         'calclines': 1,    # no. of lines for calc to be input.
+#         'MAX'    : 30,     # 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
+#         '-'      : True,   # make all subtactions min..max
+#         '_+_=_'  : True,   # = is _right_ from operator, e.g. 1+2=3
+#         'input=' : [1,3,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': True,   # shuffle _all_ the calcs
+#         'cut-max': True    # cut set of all calcs down to MAX
+#        }
         self._calcs = self._generate_calcs()
 
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/exmult.py b/ReckonPrimer.activity/exmult.py
index 72f0f98..c2ee942 100644
--- a/ReckonPrimer.activity/exmult.py
+++ b/ReckonPrimer.activity/exmult.py
@@ -7,6 +7,6 @@ from exercise import Exercise
 class ExMult(Exercise):
     def __init__(self, display, sett):
         pass
-
+        
     def _generate_calcs(self):
         pass
diff --git a/ReckonPrimer.activity/expassten.py b/ReckonPrimer.activity/expassten.py
index d2eb483..332cdad 100755
--- a/ReckonPrimer.activity/expassten.py
+++ b/ReckonPrimer.activity/expassten.py
@@ -14,32 +14,33 @@ from sugar.graphics import style
 class ExPassTen(Exercise):
     def __init__(self, dis, sett):
         self._display = dis
-        self._sett = {'topic'        : 'passten',
-         'title' : 'template expassten',
-         'descript': 'addition and subtraction with carry, \
-                            i.e. with passing the 10 barrier. ',
-         '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
-         #'min'          : 5,   # +: minimum in size of number in left argument
-                                  # -: minimum in size of result
-         'max'          : 2,   # +: maximum in size of number in left argument
-                                  # -: maximum in size of result
-         #'max'          : 9,   # +: maximum in size of number in left argument
-         'input'        :[3],  # list of positions in calc 3 | 5
-                                  # where input is possible; 
-                                  # actual positions chosen by Generate.
-         '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
-        }
+        self._sett = sett
+#        {'topic'        : 'passten',
+#         'title' : 'template expassten',
+#         'descript': 'addition and subtraction with carry, \
+#                            i.e. with passing the 10 barrier. ',
+#         '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
+#         #'min'          : 5,   # +: minimum in size of number in left argument
+#                                  # -: minimum in size of result
+#         'max'          : 2,   # +: maximum in size of number in left argument
+#                                  # -: maximum in size of result
+#         #'max'          : 9,   # +: maximum in size of number in left argument
+#         'input'        :[3],  # list of positions in calc 3 | 5
+#                                  # where input is possible; 
+#                                  # actual positions chosen by Generate.
+#         '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
+#        }
         self._calcs = self._generate_calcs()
     
     def format(self, (cs, ms, linepos)):
diff --git a/ReckonPrimer.activity/extimesdiv.py b/ReckonPrimer.activity/extimesdiv.py
index 85d238d..2e8f608 100755
--- a/ReckonPrimer.activity/extimesdiv.py
+++ b/ReckonPrimer.activity/extimesdiv.py
@@ -14,28 +14,29 @@ from functions import *
 class ExTimesDiv(Exercise):
     def __init__(self, dis, sett):
         self._display = dis
-        self._sett = {'topic'        : 'times_div',
-         'title' : 'template extimesdiv',
-         'descript': 'multiplication, division and "in" \
-                            from 2 to 19 and 20 to 190. ',
-         'icon' : None,     # for quick reference of the exercise      
-         'calclines'    : 1,      # no. of lines for calc to be input.
-         'MAX'          : 100,    # maximum of calcs generated;
-                                  # TODO: Generate fills up by varying input.
-         'MIN'          : 10,     # minimum of calcs generated 090416WN:UNUSED
-         '*'            : True,   # eg.  7 . 2 =_
-         '*commute'     : True,  # commute the operands 2 . 7 = _
-         ':'            : False,  # 14 : 2 = _
-         'in'           : False,  # 2 in 14 = _
-         'remainder'    : False,  # : | in ... with remainder
-         'min'          : 2,      # +: minimum number in right *operand
-                                  # -: minimum result
-         'max'          : 2,      # +: maximum number in right *operand
-                                  # -: maximum result
-         'shuffle_all'  : False,   # shuffle all calcs  
-         'shuffle_inner': True,   # shuffle only 1st (inner) iteration
-         'cut-max'      : True   # cut set of all calcs down to MAX
-        }
+        self._sett = sett
+#        {'topic'        : 'times_div',
+#         'title' : 'template extimesdiv',
+#         'descript': 'multiplication, division and "in" \
+#                            from 2 to 19 and 20 to 190. ',
+#         'icon' : None,     # for quick reference of the exercise      
+#         'calclines'    : 1,      # no. of lines for calc to be input.
+#         'MAX'          : 100,    # maximum of calcs generated;
+#                                  # TODO: Generate fills up by varying input.
+#         'MIN'          : 10,     # minimum of calcs generated 090416WN:UNUSED
+#         '*'            : True,   # eg.  7 . 2 =_
+#         '*commute'     : True,  # commute the operands 2 . 7 = _
+#         ':'            : False,  # 14 : 2 = _
+#         'in'           : False,  # 2 in 14 = _
+#         'remainder'    : False,  # : | in ... with remainder
+#         'min'          : 2,      # +: minimum number in right *operand
+#                                  # -: minimum result
+#         'max'          : 2,      # +: maximum number in right *operand
+#                                  # -: maximum result
+#         'shuffle_all'  : False,   # shuffle all calcs  
+#         'shuffle_inner': True,   # shuffle only 1st (inner) iteration
+#         'cut-max'      : True   # cut set of all calcs down to MAX
+#        }
         self._calcs = self._generate_calcs()
 
     def format(self, (calc, linepos)):