Commit 0d7155c8 authored by Martin Reinecke's avatar Martin Reinecke

more syncing work

parents 496b9d07 62d01c10
Pipeline #17241 canceled with stage
in 2 minutes and 15 seconds
from nifty.energies.energy import Energy
from nifty.energies.memoization import memo
from .energy import Energy
from .memoization import memo
class QuadraticEnergy(Energy):
......
......@@ -18,7 +18,6 @@
from __future__ import division
import abc
import numpy as np
from .minimizer import Minimizer
......
......@@ -18,7 +18,7 @@
from builtins import range
import abc
from nifty.nifty_meta import NiftyMeta
from ..nifty_meta import NiftyMeta
import numpy as np
......
......@@ -17,7 +17,7 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
from nifty.nifty_meta import NiftyMeta
from ..nifty_meta import NiftyMeta
import numpy as np
......
......@@ -17,9 +17,9 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
from builtins import object
from ...energies import QuadraticEnergy
from ...minimization import ConjugateGradient
from ...field import Field
from ...energies import QuadraticEnergy
class InvertibleOperatorMixin(object):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment