Revert debug prints and fix reference file name

CM2S · Jan 17, 2024 · c0eafe7 · c0eafe7
1 parent 6a22547
commit c0eafe7
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 17 deletions.
diff --git a/piglot/objectives/fitting.py b/piglot/objectives/fitting.py
@@ -155,9 +155,6 @@ def __init__(
         self.show = show
         self.weight = weight
         # Load the data right away
-        print(filename)
-        print(os.getcwd())
-        print(os.listdir(os.getcwd()))
         data = np.genfromtxt(filename, skip_header=skip_header)[:, [x_col - 1, y_col - 1]]
         self.x_data = data[:, 0]
         self.y_data = data[:, 1]

diff --git a/test/examples/dummy_composite.yaml b/test/examples/dummy_composite.yaml
@@ -26,5 +26,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
diff --git a/test/examples/dummy_composite_stochastic.yaml b/test/examples/dummy_composite_stochastic.yaml
@@ -33,5 +33,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1', 'modifier_2']
diff --git a/test/examples/dummy_filtering.yaml b/test/examples/dummy_filtering.yaml
@@ -25,6 +25,6 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
       filter_tol: 1e-6
diff --git a/test/examples/dummy_simple.yaml b/test/examples/dummy_simple.yaml
@@ -25,5 +25,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
diff --git a/test/examples/dummy_simple_stochastic.yaml b/test/examples/dummy_simple_stochastic.yaml
@@ -33,5 +33,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1', 'modifier_2']
diff --git a/test/examples/dummy_transformer.yaml b/test/examples/dummy_transformer.yaml
@@ -25,7 +25,7 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
       transformer:
         x_scale: -1

diff --git a/test/examples/reference.txt b/test/examples/reference.txt
@@ -0,0 +1,5 @@
+0.0 0.0
+0.25 50
+0.5 100
+0.75 150
+1.0 200
diff --git a/test/examples_assertions/dummy_invalid_parameters.yaml b/test/examples_assertions/dummy_invalid_parameters.yaml
@@ -25,5 +25,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
diff --git a/test/examples_assertions/dummy_invalid_parameters2.yaml b/test/examples_assertions/dummy_invalid_parameters2.yaml
@@ -26,5 +26,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
diff --git a/test/examples_assertions/reference.txt b/test/examples_assertions/reference.txt
@@ -0,0 +1,5 @@
+0.0 0.0
+0.25 50
+0.5 100
+0.75 150
+1.0 200
diff --git a/test/examples_plots/dummy_composite.yaml b/test/examples_plots/dummy_composite.yaml
@@ -26,5 +26,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
diff --git a/test/examples_plots/dummy_composite_stochastic.yaml b/test/examples_plots/dummy_composite_stochastic.yaml
@@ -33,5 +33,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1', 'modifier_2']
diff --git a/test/examples_plots/dummy_filtering.yaml b/test/examples_plots/dummy_filtering.yaml
@@ -25,6 +25,6 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
       filter_tol: 1e-6
diff --git a/test/examples_plots/dummy_simple.yaml b/test/examples_plots/dummy_simple.yaml
@@ -25,5 +25,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
diff --git a/test/examples_plots/dummy_simple_stochastic.yaml b/test/examples_plots/dummy_simple_stochastic.yaml
@@ -33,5 +33,5 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1', 'modifier_2']
diff --git a/test/examples_plots/dummy_transformer.yaml b/test/examples_plots/dummy_transformer.yaml
@@ -25,7 +25,7 @@ objective:
 
 
   references:
-    'reference.dat':
+    'reference.txt':
       prediction: ['modifier_1']
       transformer:
         x_scale: -1

diff --git a/test/examples_plots/reference.txt b/test/examples_plots/reference.txt
@@ -0,0 +1,5 @@
+0.0 0.0
+0.25 50
+0.5 100
+0.75 150
+1.0 200