added self._errors to Ex* and Collection

8 files changed, 29 insertions, 20 deletions

diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py
index 3f86717..387b919 100644
--- a/ReckonPrimer.activity/collection.py
+++ b/ReckonPrimer.activity/collection.py
@@ -22,29 +22,31 @@ class Collection:
     def __init__(self, display, coach):
         self._sett = Settings()
         #WN.LV diese Daten via pickle.load(...) holen 
-        self._data = [self._sett.get_setting('addsub_simp'),
-                      self._sett.get_setting('passten'),
-                      self._sett.get_setting('times_div')]
+        self._data = [(self._sett.get_setting('addsub_simp'), []),
+                      (self._sett.get_setting('passten'),     []),
+                      (self._sett.get_setting('times_div'),   [])]
+        #WN.LV [] ist die vorlaeufige Liste der errors
         self._display = display
         self._coach = coach
         self._active_topic = None
 
     def select(self, key):
-        """ Select an exercise by key. """
+        """ Select an exercise by key.
+        Errors are retrieved for (future) use by Coach. """
         #WN.LV Code ersetzen: key ist dann fuer Listen von Listen !!
-        _sett = self._data[key]
+        (_sett, _errors) = self._data[key]
         if _sett['topic'] == 'addsub_simp':
-            return ExAddSimp(self._display, _sett)
+            return ExAddSimp(self._display, (_sett, _errors))
         elif _sett['topic'] == 'exaddsub':
-            return ExAddSub(self._display, _sett)
+            return ExAddSub(self._display, (_sett, _errors))
         elif _sett['topic'] == 'passten':
-            return ExPassTen(self._display, _sett)
+            return ExPassTen(self._display, (_sett, _errors))
         elif _sett['topic'] == 'exmult':
-            return ExMult(self._display, _sett)
+            return ExMult(self._display, (_sett, _errors))
         elif _sett['topic'] == 'times_div':
-            return ExTimesDiv(self._display, _sett)
+            return ExTimesDiv(self._display, (_sett, _errors))
         elif _sett['topic'] == 'extimesadd':
-            return ExTimesAdd(self._display, _sett)
+            return ExTimesAdd(self._display, (_sett, _errors))
         else:
             raise Exception()
 
diff --git a/ReckonPrimer.activity/exaddsimp.py b/ReckonPrimer.activity/exaddsimp.py
index 194ad8e..947bf29 100755
--- a/ReckonPrimer.activity/exaddsimp.py
+++ b/ReckonPrimer.activity/exaddsimp.py
@@ -13,9 +13,10 @@ from exercise import Exercise
 from functions import *
 
 class ExAddSimp(Exercise):
-    def __init__(self, dis, sett):
+    def __init__(self, dis, (sett, errors)):
         self._display = dis
         self._sett = sett
+        self._errors = errors
 #        {'topic'  : 'addsub_simp',
 #         'title' : 'template exaddsimp',
 #         'descript': 'addition and subtraction without carry, \
diff --git a/ReckonPrimer.activity/exaddsub.py b/ReckonPrimer.activity/exaddsub.py
index 710bd80..ed3d8d9 100644
--- a/ReckonPrimer.activity/exaddsub.py
+++ b/ReckonPrimer.activity/exaddsub.py
@@ -5,7 +5,7 @@
 from exercise import Exercise
 
 class ExAddSub(Exercise):
-    def __init__(self, display, sett):
+    def __init__(self, display, (sett, errors)):
         pass
 
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/exercise.py b/ReckonPrimer.activity/exercise.py
index 63e6adf..c26b613 100755
--- a/ReckonPrimer.activity/exercise.py
+++ b/ReckonPrimer.activity/exercise.py
@@ -9,9 +9,13 @@ class Exercise:
     The values of self._sett may vary from exercise to exercise.
     """
     def __init__(self):
-        """ An Exercise stores data on evaluation, i.e. on how often the
-        Exercise has been done, what errors have been made TODO """
-        self._eval = None
+        """ An Exercise stores data on evaluation, i.e date, duration TODO.
+        The preliminary format deals with errors only and is
+        [(None, errors), (settings, errors)], where None indicates, 
+        that the settings are not changed by the Learner,
+        and settings indicates updates done by the Learner.
+        The list allows to do an Exercise subsequently several times. """
+        self._eval = []
         """ The settings determine the generation of calculations.
         The fields of the settings are determined by self._sett['topic'];
         the values of the settings are different for different Exercises.
diff --git a/ReckonPrimer.activity/exmult.py b/ReckonPrimer.activity/exmult.py
index c2ee942..fb6452f 100644
--- a/ReckonPrimer.activity/exmult.py
+++ b/ReckonPrimer.activity/exmult.py
@@ -5,7 +5,7 @@
 from exercise import Exercise
 
 class ExMult(Exercise):
-    def __init__(self, display, sett):
+    def __init__(self, display, (sett, errors)):
         pass
         
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/expassten.py b/ReckonPrimer.activity/expassten.py
index 332cdad..b177cfa 100755
--- a/ReckonPrimer.activity/expassten.py
+++ b/ReckonPrimer.activity/expassten.py
@@ -12,9 +12,10 @@ import pango
 from sugar.graphics import style
 
 class ExPassTen(Exercise):
-    def __init__(self, dis, sett):
+    def __init__(self, dis, (sett, errors)):
         self._display = dis
         self._sett = sett
+        self._errors = errors
 #        {'topic'        : 'passten',
 #         'title' : 'template expassten',
 #         'descript': 'addition and subtraction with carry, \
diff --git a/ReckonPrimer.activity/extimesadd.py b/ReckonPrimer.activity/extimesadd.py
index a819930..060375b 100644
--- a/ReckonPrimer.activity/extimesadd.py
+++ b/ReckonPrimer.activity/extimesadd.py
@@ -5,7 +5,7 @@
 from exercise import Exercise
 
 class ExTimesAdd(Exercise):
-    def __init__(self, display, sett):
+    def __init__(self, display, (sett, errors)):
         pass
 
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/extimesdiv.py b/ReckonPrimer.activity/extimesdiv.py
index 2e8f608..9c997f3 100755
--- a/ReckonPrimer.activity/extimesdiv.py
+++ b/ReckonPrimer.activity/extimesdiv.py
@@ -12,9 +12,10 @@ from exercise import Exercise
 from functions import *
 
 class ExTimesDiv(Exercise):
-    def __init__(self, dis, sett):
+    def __init__(self, dis, (sett, errors)):
         self._display = dis
         self._sett = sett
+        self._errors = errors
 #        {'topic'        : 'times_div',
 #         'title' : 'template extimesdiv',
 #         'descript': 'multiplication, division and "in" \