Resolve "Experiment pipeline"

Closes #12 (closed)

code/bolsonaro/models/model_raw_results.py

@@ -8,8 +8,8 @@ class ModelRawResults(object):
 
     def __init__(self, model_object, training_time,
         datetime, train_score, dev_score, test_score,
-        score_metric, train_score_base, dev_score_base,
-        test_score_base):
+        train_score_base, dev_score_base,
+        test_score_base, score_metric, base_score_metric):
 
         self._model_object = model_object
         self._training_time = training_time
@@ -17,10 +17,11 @@ class ModelRawResults(object):
         self._train_score = train_score
         self._dev_score = dev_score
         self._test_score = test_score
-        self._score_metric = score_metric
         self._train_score_base = train_score_base
         self._dev_score_base = dev_score_base
         self._test_score_base = test_score_base
+        self._score_metric = score_metric
+        self._base_score_metric = base_score_metric
     
     @property
     def model_object(self):
@@ -46,10 +47,6 @@ class ModelRawResults(object):
     def test_score(self):
         return self._test_score
 
-    @property
-    def score_metric(self):
-        return self._score_metric
-
     @property
     def train_score_base(self):
         return self._train_score_base
@@ -62,6 +59,14 @@ class ModelRawResults(object):
     def test_score_base(self):
         return self._test_score_base
 
+    @property
+    def score_metric(self):
+        return self._score_metric
+
+    @property
+    def base_score_metric(self):
+        return self._base_score_metric
+
     def save(self, models_dir):
         save_obj_to_pickle(models_dir + os.sep + 'model_raw_results.pickle',
             self.__dict__)