From 6e9e9bf35bc32998527d7aefe115a796ea1bd82f Mon Sep 17 00:00:00 2001
From: Kristina Thieme <krissithieme@gmx.de>
Date: Thu, 23 Nov 2023 12:29:11 +0100
Subject: [PATCH] resolved conflicts

---
 deepcave/evaluators/epm/random_forest.py | 1 -
 deepcave/evaluators/lpi.py               | 2 --
 deepcave/utils/styled_plot.py            | 1 -
 tests/test_evaluators/test_fanova.py     | 1 +
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/deepcave/evaluators/epm/random_forest.py b/deepcave/evaluators/epm/random_forest.py
index bdf0fd92..85e96223 100644
--- a/deepcave/evaluators/epm/random_forest.py
+++ b/deepcave/evaluators/epm/random_forest.py
@@ -19,7 +19,6 @@
 
 import functools
 import warnings
-from random import random
 
 import numpy as np
 import pyrfr.regression as regression
diff --git a/deepcave/evaluators/lpi.py b/deepcave/evaluators/lpi.py
index cfe71d9d..01c227c5 100644
--- a/deepcave/evaluators/lpi.py
+++ b/deepcave/evaluators/lpi.py
@@ -10,8 +10,6 @@
 
 from typing import Any, Dict, List, Optional, Tuple, Union
 
-from random import random
-
 import numpy as np
 from ConfigSpace import Configuration
 from ConfigSpace.c_util import change_hp_value, check_forbidden
diff --git a/deepcave/utils/styled_plot.py b/deepcave/utils/styled_plot.py
index df2bdad6..547d9651 100644
--- a/deepcave/utils/styled_plot.py
+++ b/deepcave/utils/styled_plot.py
@@ -51,7 +51,6 @@ class StyledPlot:
         The style used is seaborn.
     """
 
-
     def __init__(self) -> None:
         plt.style.use("seaborn-v0_8")
 
diff --git a/tests/test_evaluators/test_fanova.py b/tests/test_evaluators/test_fanova.py
index f8228487..530a54b3 100644
--- a/tests/test_evaluators/test_fanova.py
+++ b/tests/test_evaluators/test_fanova.py
@@ -40,5 +40,6 @@ def test_seed(self):
         # With seed: Same results
         assert importance_dict_run_1["n_neurons"][1] == importance_dict_run_2["n_neurons"][1]
 
+
 if __name__ == "__main__":
     unittest.main()