test updated to be compatible with 1.3.0

Author: Marco Dal Molin

test/unittest/01_FR.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import PowerReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 
 
 class TestFR(unittest.TestCase):

test/unittest/02_UR.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import UnsaturatedReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 
 
 class TestUR(unittest.TestCase):

test/unittest/03_UR_FR.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import PowerReservoir, UnsaturatedReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 from superflexpy.framework.unit import Unit
 
 class TestHRU(unittest.TestCase):

test/unittest/04_UR_FR_SR.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import PowerReservoir, UnsaturatedReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasussusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 from superflexpy.implementation.elements.structure_elements import Splitter, Junction
 from superflexpy.framework.unit import Unit
 

test/unittest/05_2HRUs.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import PowerReservoir, UnsaturatedReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 from superflexpy.implementation.elements.structure_elements import Splitter, Junction
 from superflexpy.framework.unit import Unit
 from superflexpy.framework.node import Node

test/unittest/06_3Cats_2HRUs.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import PowerReservoir, UnsaturatedReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 from superflexpy.implementation.elements.structure_elements import Splitter, Junction
 from superflexpy.framework.unit import Unit
 from superflexpy.framework.node import Node

test/unittest/07_FR_2dt.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import PowerReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 
 
 class TestFR(unittest.TestCase):

test/unittest/08_UR_2dt.py

@@ -35,8 +35,8 @@
 sys.path.insert(0, package_path)
 
 from superflexpy.implementation.elements.hbv import UnsaturatedReservoir
-from superflexpy.implementation.computation.pegasus_root_finding import PegasusNumba, PegasusPython
-from superflexpy.implementation.computation.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
+from superflexpy.implementation.root_finders.pegasus import PegasusNumba, PegasusPython
+from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
 
 
 class TestUR(unittest.TestCase):