From 570a1ddd81d56ae7211524d529ef21cfc7afe1fb Mon Sep 17 00:00:00 2001 From: Martin Reinecke Date: Fri, 21 Jul 2017 19:03:29 +0200 Subject: [PATCH] revert a few temporary changes --- demos/critical_filtering.py | 12 ++++++------ nifty/field.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demos/critical_filtering.py b/demos/critical_filtering.py index c05faf32..4337999c 100644 --- a/demos/critical_filtering.py +++ b/demos/critical_filtering.py @@ -113,17 +113,17 @@ if __name__ == "__main__": x = a_energy.value print(x, iteration) - minimizer1 = RelaxedNewton(convergence_tolerance=1e-8, + minimizer1 = RelaxedNewton(convergence_tolerance=1e-4, convergence_level=1, iteration_limit=5, callback=convergence_measure) - minimizer2 = VL_BFGS(convergence_tolerance=1e-8, + minimizer2 = VL_BFGS(convergence_tolerance=1e-4, convergence_level=1, - iteration_limit=1000, + iteration_limit=20, callback=convergence_measure, max_history_length=20) - minimizer3 = SteepestDescent(convergence_tolerance=1e-8, - iteration_limit=500, + minimizer3 = SteepestDescent(convergence_tolerance=1e-4, + iteration_limit=100, callback=convergence_measure) # Set starting position @@ -132,7 +132,7 @@ if __name__ == "__main__": t0 = Field(p_space, val=log(1./(1+p_space.kindex)**2)) - for i in range(50): + for i in range(500): S0 = create_power_operator(h_space, power_spectrum=exp(t0), distribution_strategy=distribution_strategy) diff --git a/nifty/field.py b/nifty/field.py index 643fa5bb..a46e36cd 100644 --- a/nifty/field.py +++ b/nifty/field.py @@ -182,7 +182,7 @@ class Field(Loggable, Versionable, object): elif isinstance(val, Field): distribution_strategy = val.distribution_strategy else: - #self.logger.debug("distribution_strategy set to default!") + self.logger.debug("distribution_strategy set to default!") distribution_strategy = gc['default_distribution_strategy'] elif distribution_strategy not in DISTRIBUTION_STRATEGIES['global']: raise ValueError( -- GitLab