Joep6

.gitignore

@@ -23,7 +23,7 @@ var/
 *.egg
 
 # PyInstaller
-#  Usually these files are written by a python script from a template
+#  Usually these files are written by a ui_code script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
@@ -71,4 +71,4 @@ venv/
 # Files
 /Data
 /docs/build
-
+.pytest_cache

.travis.yml

@@ -1,4 +1,4 @@
-language: python
+language: ui_code
 python:
     - 2.7
     - 3.6

artemis/config.py

@@ -1,3 +1,4 @@
+import logging
 import os
 from artemis.fileman.config_files import get_config_path, get_config_value
 
@@ -15,6 +16,9 @@
 _CONFIG_FILE_NAME = '.artemisrc'
 
 
+ARTEMIS_LOGGER = logging.getLogger('artemis')
+
+
 def check_or_create_artemis_config():
     config_path = get_config_path(_CONFIG_FILE_NAME)
     if not os.path.exists(config_path):

artemis/examples/demo_mnist_logreg.py

@@ -18,7 +18,7 @@
 2) Through the experiment API.
 
 In the bottom of this file, you an see example code for running either the UI or API.  You can try the different versions
-by either running this file as "python demo_mnist_logreg.py ui" or "python demo_mnist_logreg.py api"
+by either running this file as "ui_code demo_mnist_logreg.py ui" or "ui_code demo_mnist_logreg.py api"
 """
 
 

artemis/experiments/decorators.py

@@ -10,7 +10,7 @@ def experiment_function(f):
     """
     Use this decorator (@experiment_function) on a function that you want to run.  e.g.
 
-    .. code-block:: python
+    .. code-block:: ui_code
 
         @experiment_function
         def demo_my_experiment(a=1, b=2, c=3):
@@ -27,7 +27,7 @@ def experiment_root(f):
     """
     Use this decorator on a function that you want to build variants off of:
 
-    .. code-block:: python
+    .. code-block:: ui_code
 
         @experiment_root
         def demo_my_experiment(a, b=2, c=3):
@@ -44,7 +44,7 @@ class ExperimentFunction(object):
     This is the most general decorator.  You can use this to add details on the experiment.
     """
 
-    def __init__(self, show = show_record, compare = compare_experiment_records, display_function=None, comparison_function=None, one_liner_function=sensible_str, is_root=False):
+    def __init__(self, show = None, compare = compare_experiment_records, display_function=None, comparison_function=None, one_liner_function=None, result_parser = None, is_root=False, name=None):
         """
         :param show:  A function that is called when you "show" an experiment record in the UI.  It takes an experiment
             record as an argument.
@@ -55,16 +55,17 @@ def __init__(self, show = show_record, compare = compare_experiment_records, dis
             You can use call this via the UI with the compare_experiment_results command.
         :param one_liner_function: A function that takes your results and returns a 1 line string summarizing them.
         :param is_root: True to make this a root experiment - so that it is not listed to be run itself.
+        :param name: Custom name (if None, experiment will be named after decorated function)
         """
         self.show = show
         self.compare = compare
 
         if display_function is not None:
-            assert show is show_record, "You can't set both display function and show.  (display_function is deprecated)"
+            assert show is None, "You can't set both display function and show.  (display_function is deprecated)"
             show = lambda rec: display_function(rec.get_result())
 
         if comparison_function is not None:
-            assert compare is compare_experiment_records, "You can't set both display function and show.  (display_function is deprecated)"
+            # assert sh is None, "You can't set both display function and show.  (display_function is deprecated)"
 
             def compare(records):
                 record_experiment_ids_uniquified = uniquify_duplicates(rec.get_experiment_id() for rec in records)
@@ -74,15 +75,23 @@ def compare(records):
         self.compare = compare
         self.is_root = is_root
         self.one_liner_function = one_liner_function
+        self.result_parser = result_parser
+        self.name = name
 
     def __call__(self, f):
+        """
+        :param Callable f: The function you decorated
+        :return Experiment: An Experiment object (It still behaves as the original function when you call it, but now
+            has additional methods attached to it associated with the experiment).
+        """
         f.is_base_experiment = True
         ex = Experiment(
-            name=f.__name__,
+            name=f.__name__ if self.name is None else self.name,
             function=f,
             show=self.show,
             compare = self.compare,
             one_liner_function=self.one_liner_function,
-            is_root=self.is_root
+            is_root=self.is_root,
+            result_parser=self.result_parser,
         )
         return ex