extended settings with calclines

4 files changed, 7 insertions, 6 deletions

diff --git a/ReckonPrimer.activity/Exercise.py b/ReckonPrimer.activity/Exercise.py
index 37817a4..0d97b54 100755
--- a/ReckonPrimer.activity/Exercise.py
+++ b/ReckonPrimer.activity/Exercise.py
@@ -21,9 +21,9 @@ class Exercise:
         Exercise has been done, what errors have been made TODO """
         self._eval = None
         """ The settings determine the generation of calculations.
-        The fields of the settings are determined by the 'topic';
-        the values of the settings are different for different Exercises;
-        the settings may even be updated by the user."""
+        The fields of the settings are determined by self._sett['topic'];
+        the values of the settings are different for different Exercises.
+        self._sett['calclines'] determines the # of lines in a calculation."""
         self._sett = None
         """ Calculations are generated according to the settings. """
         self._calcs = None
diff --git a/ReckonPrimer.activity/exaddsimp.py b/ReckonPrimer.activity/exaddsimp.py
index cb7be8a..0ce6634 100755
--- a/ReckonPrimer.activity/exaddsimp.py
+++ b/ReckonPrimer.activity/exaddsimp.py
@@ -15,7 +15,8 @@ class ExAddSimp(Exercise):
         self._title = 'template exaddsimp'
         self._display = dis
         self._sett = {'topic'  : 'addsub_simp',
-         'MAX'    : 50,     # maximum of calcs generated;
+         'calclines': 1,    # no. of lines for calc to be input.
+         '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
diff --git a/ReckonPrimer.activity/expassten.py b/ReckonPrimer.activity/expassten.py
index 464250f..75a05c1 100755
--- a/ReckonPrimer.activity/expassten.py
+++ b/ReckonPrimer.activity/expassten.py
@@ -13,8 +13,7 @@ class ExPassTen(Exercise):
         self._title = 'template expassten'
         self._display = dis
         self._sett = {'topic'        : 'passten',
-         'ID'           : 'passten_01', # for 
-         'descr'        : 'subtractions passing 10', 
+         '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
diff --git a/ReckonPrimer.activity/extimesdiv.py b/ReckonPrimer.activity/extimesdiv.py
index c0d6069..a5aefab 100755
--- a/ReckonPrimer.activity/extimesdiv.py
+++ b/ReckonPrimer.activity/extimesdiv.py
@@ -15,6 +15,7 @@ class ExTimesDiv(Exercise):
         self._title = 'template extimesdiv'
         self._display = dis
         self._sett = {'topic'        : 'times_div',
+         '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