Merge pull request #38 from AutoResearch/fix-observations-to-experime…

…nt-data Fix observations to experiment data
AutoResearch · Jul 26, 2024 · d04b439 · d04b439
2 parents 5d628f6 + 68ac55a
commit d04b439
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 482 deletions.
diff --git a/docs/Examples/Economics/Expected-Value-Theory.ipynb b/docs/Examples/Economics/Expected-Value-Theory.ipynb
diff --git a/docs/Examples/Economics/Prospect-Theory.ipynb b/docs/Examples/Economics/Prospect-Theory.ipynb
diff --git a/docs/Examples/Psychology/Luce-Choice-Ratio.ipynb b/docs/Examples/Psychology/Luce-Choice-Ratio.ipynb
diff --git a/docs/Examples/Psychophysics/Weber-Fechner-Law.ipynb b/docs/Examples/Psychophysics/Weber-Fechner-Law.ipynb
diff --git a/src/autora/experiment_runner/synthetic/economics/expected_value_theory.py b/src/autora/experiment_runner/synthetic/economics/expected_value_theory.py
@@ -161,7 +161,7 @@ def plotter(model=None):
             X[:, 2] = v_b
             X[:, 3] = p_b
 
-            y = ground_truth(X)
+            y = ground_truth(X)[variables.dependent_variables[0].name]
             colors = mcolors.TABLEAU_COLORS
             col_keys = list(colors.keys())
             plt.plot(

diff --git a/src/autora/experiment_runner/synthetic/economics/prospect_theory.py b/src/autora/experiment_runner/synthetic/economics/prospect_theory.py
@@ -166,7 +166,7 @@ def plotter(model=None):
             X[:, 2] = v_b
             X[:, 3] = p_b
 
-            y = ground_truth(X)
+            y = ground_truth(X)[variables.dependent_variables[0].name]
             colors = mcolors.TABLEAU_COLORS
             col_keys = list(colors.keys())
             plt.plot(

diff --git a/src/autora/experiment_runner/synthetic/psychology/luce_choice_ratio.py b/src/autora/experiment_runner/synthetic/psychology/luce_choice_ratio.py
@@ -205,7 +205,7 @@ def plotter(
             X[:, 2] = similarity_B1
             X[:, 3] = similarity_B2
 
-            y = ground_truth(X)
+            y = ground_truth(X)[choose_A1.name]
             plt.plot(
                 similarity_A1.reshape((len(similarity_A1), 1)),
                 y,

diff --git a/src/autora/experiment_runner/synthetic/psychophysics/stevens_power_law.py b/src/autora/experiment_runner/synthetic/psychophysics/stevens_power_law.py
@@ -98,7 +98,7 @@ def plotter(
         colors = mcolors.TABLEAU_COLORS
         col_keys = list(colors.keys())
         X = domain()
-        y = ground_truth(X)
+        y = ground_truth(X)[dv1.name]
         plt.plot(X, y, label="Original", c=colors[col_keys[0]])
         if model is not None:
             y = model.predict(X)

diff --git a/src/autora/experiment_runner/synthetic/psychophysics/weber_fechner_law.py b/src/autora/experiment_runner/synthetic/psychophysics/weber_fechner_law.py
@@ -124,7 +124,7 @@ def plotter(
             S0 = S0_value + np.zeros(delta_S.shape)
             S1 = S0 + delta_S
             X = np.array([S0, S1]).T
-            y = ground_truth(X)
+            y = ground_truth(X)[dv1.name]
             plt.plot(
                 delta_S,
                 y,