diff --git a/CADETMatch/match.py b/CADETMatch/match.py index 1962cf4..fc08e65 100644 --- a/CADETMatch/match.py +++ b/CADETMatch/match.py @@ -117,7 +117,6 @@ def setup(cache, json_path, map_function): createProgressCSV(cache) createErrorCSV(cache) setupTemplates(cache) - setupDeap(cache) def print_version(): @@ -350,18 +349,6 @@ def setupTemplates(cache): experiment["simulation_final"] = template_final -def setupDeap(cache): - "setup the DEAP variables" - searchMethod = cache.settings.get("searchMethod", "UNSGA3") - cache.toolbox = base.Toolbox() - cache.search[searchMethod].setupDEAP( - cache, - creator, - base, - tools, - ) - - def continue_mcmc(cache, map_function): if cache.continueMCMC: json_path = util.setupMCMC(cache) diff --git a/CADETMatch/pymoo_config.py b/CADETMatch/pymoo_config.py index c02ff19..18fb975 100644 --- a/CADETMatch/pymoo_config.py +++ b/CADETMatch/pymoo_config.py @@ -281,12 +281,3 @@ def run(cache, alg="unsga3"): util.finish(cache) sub.graph_corner_process(cache, last=True) return hof - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass - diff --git a/CADETMatch/search/altScore.py b/CADETMatch/search/altScore.py index e07ea26..82ad712 100644 --- a/CADETMatch/search/altScore.py +++ b/CADETMatch/search/altScore.py @@ -135,12 +135,3 @@ def run(cache, tools, creator): util.finish(cache) sub.graph_corner_process(cache, last=True) return hof - - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass \ No newline at end of file diff --git a/CADETMatch/search/gradient.py b/CADETMatch/search/gradient.py index 866b820..9510cad 100644 --- a/CADETMatch/search/gradient.py +++ b/CADETMatch/search/gradient.py @@ -112,12 +112,3 @@ def run(cache, tools, creator): sub.graph_corner_process(cache, last=True) return hof - - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass \ No newline at end of file diff --git a/CADETMatch/search/graphSpace.py b/CADETMatch/search/graphSpace.py index 6a3ba6c..4fd03e6 100644 --- a/CADETMatch/search/graphSpace.py +++ b/CADETMatch/search/graphSpace.py @@ -104,11 +104,3 @@ def run(cache, tools, creator): return hof - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass diff --git a/CADETMatch/search/mcmc.py b/CADETMatch/search/mcmc.py index eb90f75..11c91a1 100644 --- a/CADETMatch/search/mcmc.py +++ b/CADETMatch/search/mcmc.py @@ -1120,37 +1120,6 @@ def getCheckPoint(checkpointFile, cache): return checkpoint -def setupDEAP( - cache, - creator, - base, - tools, -): - "setup the DEAP variables" - creator.create( - "Individual", - pop.Individual - ) - - creator.create( - "IndividualMeta", - pop.Individual - ) - cache.toolbox.register( - "individualMeta", util.initIndividual, creator.IndividualMeta, cache - ) - - cache.toolbox.register( - "individual", - util.generateIndividual, - creator.Individual, - len(cache.MIN_VALUE), - cache.MIN_VALUE, - cache.MAX_VALUE, - cache, - ) - - def process( population_order, cache, diff --git a/CADETMatch/search/multistart.py b/CADETMatch/search/multistart.py index e5eb84d..d76876a 100644 --- a/CADETMatch/search/multistart.py +++ b/CADETMatch/search/multistart.py @@ -107,13 +107,3 @@ def run(cache, tools, creator): sub.graph_corner_process(cache, last=True) return hof - - -def setupDEAP( - cache, - creator, - base, - tools, -): - "setup the DEAP variables" - pass \ No newline at end of file diff --git a/CADETMatch/search/nsga3.py b/CADETMatch/search/nsga3.py index e655a71..85628f0 100644 --- a/CADETMatch/search/nsga3.py +++ b/CADETMatch/search/nsga3.py @@ -7,12 +7,3 @@ def run(cache, tools, creator): "run the parameter estimation" return CADETMatch.pymoo_config.run(cache, 'nsga3') - - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass \ No newline at end of file diff --git a/CADETMatch/search/scoretest.py b/CADETMatch/search/scoretest.py index 1dc49fc..24e71d8 100644 --- a/CADETMatch/search/scoretest.py +++ b/CADETMatch/search/scoretest.py @@ -116,12 +116,3 @@ def run(cache, tools, creator): util.finish(cache) sub.graph_corner_process(cache, last=True) return hof - - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass diff --git a/CADETMatch/search/unsga3.py b/CADETMatch/search/unsga3.py index e5dddfc..f2252d4 100644 --- a/CADETMatch/search/unsga3.py +++ b/CADETMatch/search/unsga3.py @@ -7,14 +7,5 @@ def run(cache, tools, creator): "run the parameter estimation" return CADETMatch.pymoo_config.run(cache, 'unsga3') - - -def setupDEAP( - cache, - creator, - base, - tools, -): - pass