Minor Fixes

Fixing circular import
e-mission · Dec 16, 2023 · 61bbe3f · 61bbe3f
1 parent 585cc90
commit 61bbe3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/emission/analysis/modelling/trip_model/models.py b/emission/analysis/modelling/trip_model/models.py
@@ -19,7 +19,7 @@
 from emission.analysis.modelling.trip_model.clustering import get_distance_matrix, single_cluster_purity
 import emission.analysis.modelling.trip_model.data_wrangling as eamtd
 import emission.storage.decorations.trip_queries as esdtq
-from emission.analysis.classification.inference.labels.inferrers import predict_cluster_confidence_discounting
+import emission.analysis.classification.inference.labels.inferrers as eacili
 import emission.core.wrapper.entry as ecwe
 import emission.analysis.modelling.trip_model.greedy_similarity_binning as eamtg
 import emission.core.common as ecc
@@ -738,7 +738,7 @@ def predict_proba(self, test_df):
         replaced_distribs = []
 
         for trip in test_trips:
-            trip_prediction = predict_cluster_confidence_discounting(trip)
+            trip_prediction = eacili.predict_cluster_confidence_discounting(trip)
 
             if len(trip_prediction) == 0:
                 # model could not find cluster for the trip

diff --git a/emission/tests/modellingTests/TestForestModelLoadandSave.py b/emission/tests/modellingTests/TestForestModelLoadandSave.py
@@ -1,7 +1,6 @@
 from typing import ByteString
 import unittest
 import logging
-import pytest
 from unittest.mock import patch
 import emission.analysis.modelling.trip_model.run_model as eamur
 import emission.analysis.modelling.trip_model.model_type as eamumt