Commit 78b77518 by Martin Reinecke

### merge NIFTY_4

parents 0e8e4be1 82c170d1
 ... ... @@ -10,8 +10,8 @@ if __name__ == "__main__": p_spec = lambda k: (1. / (k*correlation_length + 1) ** 4) nonlinearity = Tanh() #nonlinearity = Linear() #nonlinearity = Exponential() # nonlinearity = Linear() # nonlinearity = Exponential() # Set up position space s_space = ift.RGSpace(1024) ... ...
 from .version import __version__ from . import dobj from .domains import * from .domain_tuple import DomainTuple from .operators import * from .field import Field from .operators import * from .probing.utils import probe_with_posterior_samples, probe_diagonal, \ StatCalculator from .minimization import * from .sugar import * ... ... @@ -28,5 +22,5 @@ from .multi import * __all__ = ["__version__", "dobj", "DomainTuple"] + \ domains.__all__ + operators.__all__ + minimization.__all__ + \ ["DomainTuple", "Field", "sqrt", "exp", "log"] + \ ["Field"] + sugar.__all__ + \ multi.__all__
 ... ... @@ -721,6 +721,15 @@ class Field(object): self._domain.__str__() + \ "\n- val = " + repr(self.val) def equivalent(self, other): if self is other: return True if not isinstance(other, Field): return False if self._domain != other._domain: return False return (self._val == other._val).all() for op in ["__add__", "__radd__", "__iadd__", "__sub__", "__rsub__", "__isub__", "__mul__", "__rmul__", "__imul__", ... ...
 ... ... @@ -15,10 +15,11 @@ from .energy import Energy from .quadratic_energy import QuadraticEnergy from .line_energy import LineEnergy from .yango import Yango from .energy_sum import EnergySum __all__ = ["LineSearch", "LineSearchStrongWolfe", "IterationController", "GradientNormController", "Minimizer", "ConjugateGradient", "NonlinearCG", "DescentMinimizer", "SteepestDescent", "VL_BFGS", "RelaxedNewton", "ScipyMinimizer", "NewtonCG", "L_BFGS_B", "ScipyCG", "Energy", "QuadraticEnergy", "LineEnergy", "L_BFGS", "Yango"] "LineEnergy", "L_BFGS", "EnergySum", "Yango"]