Commit 94d60caa authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'NIFTy_5' of gitlab.mpcdf.mpg.de:ift/nifty-dev into NIFTy_5

parents cdd5f32c bdd7999c
......@@ -22,7 +22,6 @@ import numpy as np
from ..compat import *
from ..domains.power_space import PowerSpace
from ..domains.unstructured_domain import UnstructuredDomain
from ..field import Field
from ..multi_domain import MultiDomain
from ..operators.operator import Operator
......
......@@ -3,8 +3,6 @@ from __future__ import absolute_import, division, print_function
from ..compat import *
from ..linearization import Linearization
from ..minimization.energy import Energy
from ..operators.block_diagonal_operator import BlockDiagonalOperator
from ..operators.scaling_operator import ScalingOperator
class EnergyAdapter(Energy):
......
......@@ -3,8 +3,6 @@ from __future__ import absolute_import, division, print_function
from ..compat import *
from .energy import Energy
from ..linearization import Linearization
from ..operators.scaling_operator import ScalingOperator
from ..operators.block_diagonal_operator import BlockDiagonalOperator
from .. import utilities
......
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