Merge pull request #5 from nickpadd/develop

Develop
nickpadd · Nov 16, 2023 · 8b712a1 · 8b712a1
2 parents afe5fd3 + e6adb66
commit 8b712a1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/europeanfootballleaguepredictor/models/__pycache__/probability_estimator.cpython-39.pyc b/europeanfootballleaguepredictor/models/__pycache__/probability_estimator.cpython-39.pyc
diff --git a/europeanfootballleaguepredictor/models/probability_estimator.py b/europeanfootballleaguepredictor/models/probability_estimator.py
@@ -1,6 +1,5 @@
 from europeanfootballleaguepredictor.models.base_model import BaseModel
 from europeanfootballleaguepredictor.models.bettor import Bettor
-from europeanfootballleaguepredictor.models.supervisor import Supervisor
 import numpy as np
 from scipy.stats import poisson
 import pandas as pd 

diff --git a/tests/__pycache__/test_predictor_network.cpython-39-pytest-7.2.0.pyc b/tests/__pycache__/test_predictor_network.cpython-39-pytest-7.2.0.pyc
diff --git a/tests/test_predictor_network.py b/tests/test_predictor_network.py
@@ -170,7 +170,7 @@ def test_deduct_goalrate(self, config_settings):
         logger.debug(goal_rate)
         assert not any(np.any(np.isnan(value)) for value in goal_rate.values())
 
-    def test_predict_matches(self, config_settings, create_dummy_dataframe):
+    def test_produce_probabilities(self, config_settings, create_dummy_dataframe):
 
         short, long, for_pred_short, for_pred_long = [create_dummy_dataframe for i in range(4)]
 
@@ -186,7 +186,7 @@ def test_predict_matches(self, config_settings, create_dummy_dataframe):
         config = config_settings
         network = ProbabilityEstimatorNetwork(voting_dict=config.voting_dict, matchdays_to_drop=config.matchdays_to_drop)
         network.build_network(regressor = LinearRegression)
-        prediction_frame = network.predict_matches(long_term_data=long, short_term_data=short, for_prediction_long=for_pred_long, for_prediction_short=for_pred_short)
+        prediction_frame = network.produce_probabilities(long_term_data=long, short_term_data=short, for_prediction_long=for_pred_long, for_prediction_short=for_pred_short)
 
         logger.debug(prediction_frame)
         for index, row in prediction_frame.iterrows():