clean up before release

20 files changed, 103 insertions, 73 deletions

diff --git a/MANIFEST b/MANIFEST
index e6c8653..a03be55 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -144,6 +144,8 @@ ep_positionconstraint_centered.py
 ep_positionconstraint_none.py
 ep_sampler_affineifs.py
 ep_sampler_centeredwalk.py
+ep_sampler_fermatspiral.py
+ep_sampler_logarithmicspiral.py
 ep_sampler_randomwalk.py
 ep_sampler_rectilineargrid.py
 ep_sampler_squaregrid.py
diff --git a/activity.py b/activity.py
index 203666b..3304162 100644
--- a/activity.py
+++ b/activity.py
@@ -80,7 +80,8 @@ class KandidActivity(activity.Activity):
         # Create a controller to connect view and model
         self._controller = ka_controller.KandidController( \
                                                       self._widget,
-                                                      self.get_activity_root())
+                                                      self.get_activity_root(),
+                                                      handle.object_id is None)
         self._controller.create_pages()
         self.set_canvas(main_view)
  
diff --git a/ep_layer_lca.py b/ep_layer_lca.py
index 64e3cdb..c85dfcc 100644
--- a/ep_layer_lca.py
+++ b/ep_layer_lca.py
@@ -155,7 +155,7 @@ class LcaLayer(model_layer.Layer):
             lca_state[index] = state
 
 
-    def _patch_rulesize(self):
+    def patch_rulesize(self):
         rsize = self.get_numberof_rules()
         if len(self.rules) > rsize:
             self.rules = self.rules[:rsize]
@@ -165,7 +165,7 @@ class LcaLayer(model_layer.Layer):
         self.rules = [x % self.states for x in self.rules]
 
 
-    def _patch_colorsize(self):
+    def patch_colorsize(self):
         if len(self.cell_colors) > self.states:
             self.cell_colors = self.cell_colors[:self.states]
         while len(self.cell_colors) < self.states:
@@ -193,9 +193,9 @@ class LcaLayer(model_layer.Layer):
         right_neighbors_constraint = cpool.get(self, RIGHT_NEIGHBORS_CONSTRAINT)
         self.right_neighbors = model_random.jitter_discret_constrained(
                                self.right_neighbors, right_neighbors_constraint)
-        self._patch_rulesize()
+        self.patch_rulesize()
 
-        self._patch_colorsize()
+        self.patch_colorsize()
         self.colorgamut.mutate()
         for cix in range(len(self.cell_colors)):
             self.colorgamut.adjust_color(self.cell_colors[cix])
@@ -236,11 +236,11 @@ class LcaLayer(model_layer.Layer):
 
         new_one.rules = model_random.crossingover_nativeelement_list(self.rules, \
                                                                      other.rules)
-        new_one._patch_rulesize()
+        new_one.patch_rulesize()
 
         new_one.cell_colors = model_random.crossingover_list(self.cell_colors,
                                                              other.cell_colors)
-        new_one._patch_colorsize()
+        new_one.patch_colorsize()
         for cix in range(len(new_one.cell_colors)):
             new_one.colorgamut.adjust_color(new_one.cell_colors[cix])
 
diff --git a/ep_page_ancestors.py b/ep_page_ancestors.py
index 9f47f46..66f5036 100644
--- a/ep_page_ancestors.py
+++ b/ep_page_ancestors.py
@@ -31,7 +31,7 @@ class AncestorsController(object):
     inv: self._widget_list is not None
     """
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: controller is not None
         pre: widget_list is not None
diff --git a/ep_page_details.py b/ep_page_details.py
index 9c632d5..17058da 100644
--- a/ep_page_details.py
+++ b/ep_page_details.py
@@ -31,7 +31,7 @@ class DetailsController(ka_html_page.HtmlPage):
     inv: self._activity_root is not None
     """
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: controller is not None
         pre: widget_list is not None
@@ -75,7 +75,7 @@ class DetailsController(ka_html_page.HtmlPage):
         pre: len(args) >= 1
         """
         protozoon = args[0]
-        ka_debug.info('task_explain entry: ')
+#        ka_debug.info('task_explain entry: ')
         folder = os.path.join(self._activity_root, 'tmp')
         ep_key = 'html'
         formater = ka_extensionpoint.create('formater_'+ep_key,
@@ -88,14 +88,14 @@ class DetailsController(ka_html_page.HtmlPage):
         self._produced_files_list.extend(formater.produced_files_list)
         self._produced_files_list.append(formater.get_pathname())
         self.set_uri('file://' + file_path)
-        ka_debug.info('task_explain exit:  %s' % (self._uri))
+#        ka_debug.info('task_explain exit:  %s' % (self._uri))
 
     def start_calculation(self, protozoon):
         """Start explaining of a protozoon.
         pre: protozoon is not None
         """
-        ka_debug.info('DetailsController.start_calculation %s' % 
-                                                   (protozoon.get_unique_id()))
+#        ka_debug.info('DetailsController.start_calculation %s' % 
+#                                                   (protozoon.get_unique_id()))
         task = ka_task.GeneratorTask(self.task_explain,
                                      self.on_explain_completed,
                                      'explain')
@@ -104,5 +104,5 @@ class DetailsController(ka_html_page.HtmlPage):
     def on_explain_completed(self, *args):
         """HTML file and PNGs are created. Time to switch to a browser widget.
         """
-        ka_debug.info('on_explain_completed %s' % (self._uri))
+#        ka_debug.info('on_explain_completed %s' % (self._uri))
         self._controller.switch_page('DetailsController')
diff --git a/ep_page_gettingstarted.py b/ep_page_gettingstarted.py
index aefbf4d..86d2c3c 100644
--- a/ep_page_gettingstarted.py
+++ b/ep_page_gettingstarted.py
@@ -34,7 +34,7 @@ class GettingstartedController(object):
 Kandid uses a simulated evolution without a fitness function. A cybernetic system has no aesthetic feeling. Your select favorite images to give them a higher chance to reproduce. Over some generation you can  find 'cool' looking images.
     """
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: controller is not None
         pre: widget_list is not None
@@ -104,11 +104,11 @@ Kandid uses a simulated evolution without a fitness function. A cybernetic syste
     def on_readintro(self, args):
         """Show introduction page.
         """
-        ka_debug.info('on_readintro')
+#        ka_debug.info('on_readintro')
         self._controller.switch_page('IntroController')
 
     def on_startnew(self, args):
         """Show population page.
         """
-        ka_debug.info('on_startnew')
+#        ka_debug.info('on_startnew')
         self._controller.switch_page('PopulationController')
diff --git a/ep_page_intro.py b/ep_page_intro.py
index 30d67e4..0a0f47f 100644
--- a/ep_page_intro.py
+++ b/ep_page_intro.py
@@ -50,7 +50,7 @@ class IntroController(ka_html_page.HtmlPage):
                                      'intro.html')
         return file_path
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: widget_list is not None
         """
diff --git a/ep_page_population.py b/ep_page_population.py
index c32088a..b38553c 100644
--- a/ep_page_population.py
+++ b/ep_page_population.py
@@ -39,7 +39,7 @@ class PopulationController(object):
     inv: self._widget_list is not None
     """
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: controller is not None
         pre: widget_list is not None
@@ -47,6 +47,7 @@ class PopulationController(object):
         self._controller = controller
         self._widget_list = widget_list
         self._activity_root = activity_root
+        self._anew = started_anew
         self._tube = None
         self.surface_cache = {}
         self._status = ka_status.Status.instance()
@@ -226,10 +227,11 @@ class PopulationController(object):
 
     def activate_gui(self):
         """ """
-        self.incoming._update_incomming_gui()
+        self.incoming.update_incomming_gui()
 
     def _update_model(self, in_model):
         if in_model:
+#            ka_debug.info('update model')
             self.model = in_model
 #            self.model._state = model_population.STATE_EVOLVED
             self.surface_cache = {}
@@ -277,12 +279,14 @@ class PopulationController(object):
         """Test if status page will be displayed.
         pre: len(args) >= 3
         """
-        visible = args[2] == self._controller.find_page_number('PopulationController')
-        ka_debug.info('on_notebook_switch_page %s %s' % (visible, args[2]))
-        if visible and self.model is None:
-            self.model = model_population.KandidModel(POPULATION_CAPACITY)
-            self.model.randomize()
-            self.start_all_calculations()
+        if self._anew:
+            visible = args[2] == self._controller.find_page_number('PopulationController')
+#            ka_debug.info('on_notebook_switch_page %s %s %s' % (self.__class__, visible, args[2]))
+            if visible and self.model is None:
+                self._anew = False
+                self.model = model_population.KandidModel(POPULATION_CAPACITY)
+                self.model.randomize()
+                self.start_all_calculations()
 
     def on_drawingarea_expose(self, widget, event):
         """ Repaint image of a single protozoon inside population area.
@@ -376,8 +380,12 @@ class PopulationController(object):
         """
         pre: self.model is not None
         """
-        ka_debug.info('start_all_calculations %u' % (self.model.size))
 #        ka_debug.print_call_stack()
+#        if self.model is None:
+#            self.model = model_population.KandidModel(POPULATION_CAPACITY)
+#            ka_debug.info('randomize model %u' % (self.model.size))
+#            self.model.randomize()
+#        ka_debug.info('start_all_calculations %u' % (self.model.size))
         self.start_calculation([i for i in range(self.model.size)])
 
     def start_calculation(self, concerned):
@@ -604,9 +612,9 @@ class PopulationController(object):
         """
         model = model_population.read_file(file_path)
         if model is not None:
-            self._controller.switch_page('PopulationController')
             self._update_model(model)
-#            self.start_all_calculations()
+            self._controller.switch_page('PopulationController')
+            self.start_all_calculations()
         else:
             self._controller.switch_page('GettingstartedController')
 
diff --git a/ep_page_status.py b/ep_page_status.py
index 4fe5e99..1622b04 100644
--- a/ep_page_status.py
+++ b/ep_page_status.py
@@ -30,7 +30,7 @@ class StatusController(object):
     inv: self._status is not None
     """
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: controller is not None
         pre: widget_list is not None
diff --git a/ep_page_zoom.py b/ep_page_zoom.py
index d9eb004..c630fa7 100644
--- a/ep_page_zoom.py
+++ b/ep_page_zoom.py
@@ -29,7 +29,7 @@ class ZoomController(object):
     inv: self._widget_list is not None
     """
 
-    def __init__(self, controller, widget_list, activity_root):
+    def __init__(self, controller, widget_list, activity_root, started_anew):
         """
         pre: controller is not None
         pre: widget_list is not None
diff --git a/ep_sampler_fermatspiral.py b/ep_sampler_fermatspiral.py
index 170dee4..05ef68d 100644
--- a/ep_sampler_fermatspiral.py
+++ b/ep_sampler_fermatspiral.py
@@ -157,7 +157,7 @@ class FermatSpiralSampler(model_allele.Allele):
         """
         diff = self.end - self.start if self.start < self.end \
                                      else self.start - self.end
-        size = 1.0/diff
+        size = 1.0 if diff == 0 else 1.0/diff
         return size, size
 
     def explain(self):
diff --git a/ka_controller.py b/ka_controller.py
index 6fe2938..eef70ff 100644
--- a/ka_controller.py
+++ b/ka_controller.py
@@ -24,13 +24,14 @@ class KandidController(object):
     inv: self._activity_root is not None
     """
 
-    def __init__(self, widget, activity_root):
+    def __init__(self, widget, activity_root, started_anew):
         """
         pre: widget is not None
         """
         self._widget = widget
         self._widget_list = widget.widget_list
         self._activity_root = activity_root        
+        self._started_anew = started_anew
 
         self._pages = []
         
@@ -51,7 +52,8 @@ class KandidController(object):
         for name in page_names:
             page_controller = ka_extensionpoint.create(name, self,
                                                        self._widget_list,
-                                                       self._activity_root)
+                                                       self._activity_root,
+                                                       self._started_anew)
             self._pages.append(page_controller)
         self._pages.sort(cmp=KandidController.numeric_compare)
         for page_controller in self._pages:
diff --git a/ka_html_page.py b/ka_html_page.py
index 26a17d2..f376867 100644
--- a/ka_html_page.py
+++ b/ka_html_page.py
@@ -94,7 +94,7 @@ class HtmlPage(object):
         pre: len(args) >= 3
         """
         visible = args[2] == self._controller.find_page_number(self.__class__.__name__)
-        ka_debug.info('on_notebook_switch_page %s %s' % (visible, args[2]))
+#        ka_debug.info('on_notebook_switch_page %s %s' % (visible, args[2]))
         if visible and len(self._uri) > 0: 
             if ka_debug.locale_testrun:
                 # Only for testing on my computer
diff --git a/ka_incoming.py b/ka_incoming.py
index 2dfb419..120af7e 100644
--- a/ka_incoming.py
+++ b/ka_incoming.py
@@ -157,7 +157,7 @@ class KandidIncoming(object):
             del self.incoming_protozoans[iid]
             if self.incoming_surface_cache.has_key(iid):
                 del self.incoming_surface_cache[iid]
-            self._update_incomming_gui()
+            self.update_incomming_gui()
         return protozoon
 
     def decline_protozoon(self, index):
@@ -171,7 +171,7 @@ class KandidIncoming(object):
             del self.incoming_protozoans[iid]
             if self.incoming_surface_cache.has_key(iid):
                 del self.incoming_surface_cache[iid]
-            self._update_incomming_gui()
+            self.update_incomming_gui()
 
     def task_render(self, task, *args, **kwargs):
         """Draw protozoon to surface cache.
@@ -191,7 +191,7 @@ class KandidIncoming(object):
     def on_image_completed(self, *args):
         """Rendering task has finished"""
 #        ka_debug.info('incoming: on_image_completed: ' + str(args[0]))
-        self._update_incomming_gui()
+        self.update_incomming_gui()
 
     def on_incomingarea_expose(self, widget, dummy):
         """ Repaint image of a single protozoon inside incoming area.
@@ -222,7 +222,7 @@ class KandidIncoming(object):
             ctx.rectangle(0.0, 0.0, width, height)
             ctx.fill()
 
-    def _update_incomming_gui(self):
+    def update_incomming_gui(self):
         for index in range(self._capacity):
             six = str(index)
             self._widget_list.get_widget('incomingbutton_' + six). \
diff --git a/kandid.py b/kandid.py
index 5d5619f..4ea748c 100644
--- a/kandid.py
+++ b/kandid.py
@@ -65,7 +65,10 @@ class KandidApplication(object):
         main_view.pack_start(self._widget.get_widget_tree())
         self._window.add(main_view)
         # Create a controller to connect view and model
-        self._controller = ka_controller.KandidController(self._widget, TESTPATH)
+        self._controller = ka_controller.KandidController(self._widget,
+                                                          TESTPATH,
+#                                                          not os.path.exists(TESTMODEL))
+                                                          True)
         self._controller.create_pages()
 
         # Display everything
@@ -86,5 +89,4 @@ class KandidApplication(object):
 # If the program is run directly or passed as an argument to the python
 # interpreter then create a Kandid instance and show it
 if __name__ == "__main__":
-    ka_debug.info('starting Minimal Kandid')
     KandidApplication().main()
diff --git a/po/Kandid.pot b/po/Kandid.pot
index 633c596..35253c1 100644
--- a/po/Kandid.pot
+++ b/po/Kandid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-07 20:23+0200\n"
+"POT-Creation-Date: 2010-07-25 13:40+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,6 +43,13 @@ msgstr ""
 msgid "Theme is %s. Patterns are in SVG format: "
 msgstr ""
 
+#: /home/strom/minimal/activities/Kandid.activity/ep_sampler_fermatspiral.py:167
+#, python-format
+msgid ""
+"Fermat's spiral sampler: center=%f,%f, start steps=%d, end steps=%d, radian=%"
+"f, scaling=%f"
+msgstr ""
+
 #: /home/strom/minimal/activities/Kandid.activity/ep_modifier_flip.py:102
 msgid "Flip modifier: flip horizontally and vertically."
 msgstr ""
@@ -165,7 +172,7 @@ msgstr ""
 
 #: /home/strom/minimal/activities/Kandid.activity/ka_incoming.py:84
 #: /home/strom/minimal/activities/Kandid.activity/ep_page_zoom.py:56
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:155
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:156
 msgid "Zoom"
 msgstr ""
 
@@ -194,17 +201,17 @@ msgstr ""
 msgid "Analogous color scheme"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_stamp_star.py:144
+#: /home/strom/minimal/activities/Kandid.activity/ep_stamp_star.py:168
 #, python-format
 msgid "start angle: %4.3f"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_stamp_star.py:145
+#: /home/strom/minimal/activities/Kandid.activity/ep_stamp_star.py:169
 #, python-format
 msgid "line width: %4.3f"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_stamp_star.py:146
+#: /home/strom/minimal/activities/Kandid.activity/ep_stamp_star.py:170
 msgid "Star stamp: number of rays: "
 msgstr ""
 
@@ -288,51 +295,51 @@ msgstr ""
 msgid "Complementary color scheme"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:66
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:67
 msgid "Breed"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:70
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:71
 msgid "Flurry rate:"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:82
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:83
 msgid "Random"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:140
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:141
 msgid "Population"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:147
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:148
 msgid "My favorite"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:151
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:152
 msgid "Awful bore"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:160
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:161
 msgid "Publish to my friends"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:163
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:164
 msgid "Send image to journal"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:166
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:167
 msgid "Send"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:171
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:172
 msgid "Explain details"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:174
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:175
 msgid "Show ancestors"
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:177
+#: /home/strom/minimal/activities/Kandid.activity/ep_page_population.py:178
 msgid "Explain"
 msgstr ""
 
@@ -396,17 +403,17 @@ msgstr ""
 msgid " alpha="
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/activity.py:183
+#: /home/strom/minimal/activities/Kandid.activity/activity.py:184
 msgid "Activity is shared."
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/activity.py:192
-#: /home/strom/minimal/activities/Kandid.activity/activity.py:239
+#: /home/strom/minimal/activities/Kandid.activity/activity.py:193
+#: /home/strom/minimal/activities/Kandid.activity/activity.py:240
 #, python-format
 msgid "I am '%s', my handle in that group is %u."
 msgstr ""
 
-#: /home/strom/minimal/activities/Kandid.activity/activity.py:235
+#: /home/strom/minimal/activities/Kandid.activity/activity.py:236
 msgid "Joined an existing shared activity."
 msgstr ""
 
@@ -452,6 +459,13 @@ msgstr ""
 msgid "Site colors:"
 msgstr ""
 
+#: /home/strom/minimal/activities/Kandid.activity/ep_sampler_logarithmicspiral.py:179
+#, python-format
+msgid ""
+"Logarithmic spiral sampler: center=%f,%f, revolutions=%f, steps per "
+"revolution=%d, a=%f, b=%f"
+msgstr ""
+
 #: /home/strom/minimal/activities/Kandid.activity/ep_modifier_mask.py:135
 msgid "Mask modifier, center="
 msgstr ""
diff --git a/test_enumerator.py b/test_enumerator.py
index 7806f7f..a60b58d 100644
--- a/test_enumerator.py
+++ b/test_enumerator.py
@@ -100,13 +100,13 @@ class VariantEnumerator(object):
                 self._render_protozon(layer_key, merger_key)
 
     def _explain_protozon(self, a_protozoon, formater):
-            class DummyTask:
-                def __init__(self):
-                    self.quit = False
-            a_protozoon.explain(DummyTask(), formater)
-            file_path = formater.get_absolutename('html')
-            formater.write_html_file(file_path)
-            return formater.get_pathname()
+        class DummyTask:
+            def __init__(self):
+                self.quit = False
+        a_protozoon.explain(DummyTask(), formater)
+        file_path = formater.get_absolutename('html')
+        formater.write_html_file(file_path)
+        return formater.get_pathname()
 
     def _zoom_protozon(self, a_protozoon, width, height, path_name):
         export_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
diff --git a/test_history.py b/test_history.py
index 1908d3f..699d02e 100644
--- a/test_history.py
+++ b/test_history.py
@@ -118,7 +118,7 @@ class TestKandidHistory(unittest.TestCase):
 #        self.add(treeview)
 #        self.show_all()
 
-#ka_debug.info('starting TestSuite')
+#ka_debug.info('starting TestKandidHistory')
 #ka_debug.err('testing error message channel.')
 #alltests = unittest.TestSuite((\
 #                 unittest.makeSuite(TestKandidHistory), \
diff --git a/test_model.py b/test_model.py
index d59079e..ee42b1f 100644
--- a/test_model.py
+++ b/test_model.py
@@ -432,7 +432,7 @@ class TestKandidModel(unittest.TestCase):
         self.assertEqual(4.0, model.fitness[7])
 
         ka_debug.dot_start()
-        result = 'digraph persister_objects { rankdir=LR; ranksep="5.0"; node [shape=none,fontname=Sans, fontsize=9, fixedsize=true, height=0.05, width=1.0];\n' 
+        result = 'digraph persister_objects { rankdir=LR; ranksep="2.5"; node [shape=none,fontname=Sans, fontsize=9, fixedsize=true, height=0.05, width=1.0];\n' 
         result += model.dot()    
         result += '\n}'    
         plain_file = open(kandid.TESTMODEL+'.dot', 'w')
@@ -441,7 +441,7 @@ class TestKandidModel(unittest.TestCase):
             plain_file.close()
         red_count = result.count('color=red')
         unicode_count = result.count('"unicode ')
-        self.assertTrue(unicode_count > red_count)    
+        self.assertTrue(unicode_count >= red_count)    
 
         model_population.write_file(kandid.TESTMODEL, model)
         recalled_model = model_population.read_file(kandid.TESTMODEL)
diff --git a/test_pages.py b/test_pages.py
index 171df35..673e365 100644
--- a/test_pages.py
+++ b/test_pages.py
@@ -35,5 +35,6 @@ class TestKandidPages(unittest.TestCase):
         widget = ka_widget.KandidWidget()
         main_view.pack_start(widget.get_widget_tree())
         controller = ka_controller.KandidController(widget,
-                                                    ka_debug.DEBUG_PROFILE_PATH)
+                                                    ka_debug.DEBUG_PROFILE_PATH,
+                                                    True)
         controller.create_pages()