Skip to content

Commit

Permalink
Remove unnecessary utils.py file and references to set_random_seed
Browse files Browse the repository at this point in the history
  • Loading branch information
donRumata03 committed Apr 16, 2024
1 parent c7d26ba commit 60f2557
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 28 deletions.
14 changes: 0 additions & 14 deletions golem/utilities/utils.py

This file was deleted.

3 changes: 1 addition & 2 deletions test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

import pytest

from golem.utilities.utilities import urandom_mock
from golem.utilities.utils import set_random_seed
from golem.utilities.utilities import urandom_mock, set_random_seed


@pytest.fixture(autouse=True)
Expand Down
2 changes: 0 additions & 2 deletions test/integration/test_cycled_graph_evolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from golem.core.optimisers.optimization_parameters import GraphRequirements
from golem.core.optimisers.optimizer import GraphGenerationParams
from golem.metrics.graph_metrics import spectral_dist
from golem.utilities.utils import set_random_seed


def nxgraph_with_cycle(nodes_num):
Expand Down Expand Up @@ -66,7 +65,6 @@ def test_cycled_graphs_evolution():
initial_graphs = [nxgraph_with_cycle(i) for i in range(4, 20)]

optimiser = EvoGraphOptimizer(objective, initial_graphs, requirements, graph_gen_params, gp_params)
set_random_seed(42)
found_graphs = optimiser.optimise(objective)
found_graph: nx.DiGraph = graph_gen_params.adapter.restore(found_graphs[0])
assert found_graph is not None
Expand Down
2 changes: 0 additions & 2 deletions test/integration/test_molecule_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from examples.molecule_search.experiment import molecule_search_setup, get_methane, get_all_mol_metrics
from examples.molecule_search.mol_adapter import MolAdapter
from golem.utilities.utils import set_random_seed


@pytest.mark.parametrize('metric_name, metric', get_all_mol_metrics().items())
Expand All @@ -11,7 +10,6 @@ def test_molecule_search_example(metric_name, metric):
optimizer, objective = molecule_search_setup(num_iterations=10,
metrics=[metric_name],
initial_molecules=[initial_molecule])
set_random_seed(42)
found_graphs = optimizer.optimise(objective)

assert found_graphs is not None
Expand Down
2 changes: 0 additions & 2 deletions test/integration/test_quality_improvement.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from examples.synthetic_graph_evolution.tree_search import tree_search_setup
from golem.core.optimisers.genetic.gp_optimizer import EvoGraphOptimizer
from golem.core.optimisers.opt_history_objects.opt_history import OptHistory
from golem.utilities.utils import set_random_seed


def run_graph_trial(optimizer_cls):
Expand All @@ -36,7 +35,6 @@ def run_tree_trial(optimizer_cls):
@pytest.mark.parametrize('run_fun', [run_graph_trial, run_tree_trial])
@pytest.mark.parametrize('optimizer_cls', [EvoGraphOptimizer])
def test_multiobjective_improvement(optimizer_cls, run_fun):
set_random_seed(42)
found_graph, history = run_fun(optimizer_cls)
quality_improved, complexity_improved = check_improvement(history)

Expand Down
2 changes: 0 additions & 2 deletions test/integration/test_structural_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from golem.core.paths import project_root
from golem.structural_analysis.graph_sa.graph_structural_analysis import GraphStructuralAnalysis
from golem.structural_analysis.graph_sa.sa_requirements import StructuralAnalysisRequirements
from golem.utilities.utils import set_random_seed


def get_opt_graph() -> OptGraph:
Expand Down Expand Up @@ -64,7 +63,6 @@ def test_structural_analysis():
requirements=requirements,
path_to_save=path_to_save,
is_visualize_per_iteration=False)
set_random_seed(42)
optimized_graph, _ = sa.optimize(graph=opt_graph, n_jobs=1,
max_iter=2)

Expand Down
2 changes: 0 additions & 2 deletions test/integration/test_structural_diversity.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from golem.core.optimisers.optimizer import STRUCTURAL_DIVERSITY_FREQUENCY_CHECK
from golem.metrics.edit_distance import tree_edit_dist
from golem.metrics.graph_metrics import degree_distance
from golem.utilities.utils import set_random_seed

DIVERSITY_THRESHOLD = 0.5

Expand Down Expand Up @@ -47,7 +46,6 @@ def test_structural_diversity():

gp_params = set_up_params(gen_structural_check=gen_structural_check)
# running the example
set_random_seed(42)
_, history = run_trial(target_graph=target_graph,
optimizer_setup=partial(tree_search_setup, algorithm_parameters=gp_params),
node_types=node_types,
Expand Down
2 changes: 0 additions & 2 deletions test/integration/test_structure_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from golem.core.dag.graph import Graph
from golem.core.optimisers.objective import Objective
from golem.metrics.edit_distance import tree_edit_dist, graph_size
from golem.utilities.utils import set_random_seed


def run_search(size: int, distance_function: Callable, timeout_min: int = 1) -> Tuple[float, Graph]:
Expand Down Expand Up @@ -45,7 +44,6 @@ def test_simple_targets_are_found(target_sizes, distance_function, indulgence):
distances = []
for i in range(num_trials):
# to test num_trials different options
set_random_seed(i)
distance, target_graph = run_search(target_size, distance_function=distance_function, timeout_min=1)
distances.append(distance)

Expand Down

0 comments on commit 60f2557

Please sign in to comment.