fix test and removed reference to PowerMethodNonsquare

4 files changed, 11 insertions, 14 deletions

diff --git a/Wrappers/Python/ccpi/optimisation/operators/FiniteDifferenceOperator.py b/Wrappers/Python/ccpi/optimisation/operators/FiniteDifferenceOperator.py
index 835f96d..2c42532 100644
--- a/Wrappers/Python/ccpi/optimisation/operators/FiniteDifferenceOperator.py
+++ b/Wrappers/Python/ccpi/optimisation/operators/FiniteDifferenceOperator.py
@@ -7,7 +7,6 @@ Created on Fri Mar  1 22:51:17 2019
 """
 
 from ccpi.optimisation.operators import LinearOperator
-from ccpi.optimisation.ops import PowerMethodNonsquare
 from ccpi.framework import ImageData, BlockDataContainer
 import numpy as np
 
@@ -318,7 +317,7 @@ class FiniteDiff(LinearOperator):
        
     def norm(self):
         x0 = self.gm_domain.allocate('random_int')
-        self.s1, sall, svec = PowerMethodNonsquare(self, 25, x0)
+        self.s1, sall, svec = LinearOperator.PowerMethod(self, 25, x0)
         return self.s1
     
     
diff --git a/Wrappers/Python/ccpi/optimisation/operators/GradientOperator.py b/Wrappers/Python/ccpi/optimisation/operators/GradientOperator.py
index 4935435..e0b8a32 100644
--- a/Wrappers/Python/ccpi/optimisation/operators/GradientOperator.py
+++ b/Wrappers/Python/ccpi/optimisation/operators/GradientOperator.py
@@ -7,7 +7,6 @@ Created on Fri Mar  1 22:50:04 2019
 """
 
 from ccpi.optimisation.operators import Operator, LinearOperator, ScaledOperator
-from ccpi.optimisation.ops import PowerMethodNonsquare
 from ccpi.framework import ImageData, ImageGeometry, BlockGeometry, BlockDataContainer
 import numpy 
 from ccpi.optimisation.operators import FiniteDiff, SparseFiniteDiff
@@ -90,7 +89,7 @@ class Gradient(LinearOperator):
     def norm(self):
 
         x0 = self.gm_domain.allocate('random')
-        self.s1, sall, svec = PowerMethodNonsquare(self, 10, x0)
+        self.s1, sall, svec = LinearOperator.PowerMethod(self, 10, x0)
         return self.s1
     
     def __rmul__(self, scalar):
diff --git a/Wrappers/Python/ccpi/optimisation/operators/SymmetrizedGradientOperator.py b/Wrappers/Python/ccpi/optimisation/operators/SymmetrizedGradientOperator.py
index c38458d..3fc43b8 100644
--- a/Wrappers/Python/ccpi/optimisation/operators/SymmetrizedGradientOperator.py
+++ b/Wrappers/Python/ccpi/optimisation/operators/SymmetrizedGradientOperator.py
@@ -7,7 +7,6 @@ Created on Fri Mar  1 22:53:55 2019
 """
 
 from ccpi.optimisation.operators import Gradient, Operator, LinearOperator, ScaledOperator
-from ccpi.optimisation.ops import PowerMethodNonsquare
 from ccpi.framework import ImageData, ImageGeometry, BlockGeometry, BlockDataContainer
 import numpy 
 from ccpi.optimisation.operators import FiniteDiff, SparseFiniteDiff
@@ -108,7 +107,7 @@ class SymmetrizedGradient(Gradient):
         #TODO this takes time for big ImageData
         # for 2D ||grad|| = sqrt(8), 3D ||grad|| = sqrt(12)        
         x0 = ImageData(np.random.random_sample(self.domain_dim()))
-        self.s1, sall, svec = PowerMethodNonsquare(self, 25, x0)
+        self.s1, sall, svec = LinearOperator.PowerMethod(self, 25, x0)
         return self.s1 
     
 
diff --git a/Wrappers/Python/test/test_Operator.py b/Wrappers/Python/test/test_Operator.py
index 70a1cd6..542e103 100644
--- a/Wrappers/Python/test/test_Operator.py
+++ b/Wrappers/Python/test/test_Operator.py
@@ -1,6 +1,6 @@
 import unittest
 #from ccpi.optimisation.operators import Operator
-from ccpi.optimisation.ops import TomoIdentity
+#from ccpi.optimisation.ops import TomoIdentity
 from ccpi.framework import ImageGeometry, ImageData, BlockDataContainer, DataContainer
 from ccpi.optimisation.operators import BlockOperator, BlockScaledOperator,\
     FiniteDiff
@@ -54,7 +54,7 @@ class TestOperator(CCPiTestClass):
         ig = ImageGeometry(10,20,30)
         img = ig.allocate()
         scalar = 0.5
-        sid = scalar * TomoIdentity(ig)
+        sid = scalar * Identity(ig)
         numpy.testing.assert_array_equal(scalar * img.as_array(), sid.direct(img).as_array())
         
 
@@ -63,7 +63,7 @@ class TestOperator(CCPiTestClass):
         img = ig.allocate()
         self.assertTrue(img.shape == (30,20,10))
         self.assertEqual(img.sum(), 0)
-        Id = TomoIdentity(ig)
+        Id = Identity(ig)
         y = Id.direct(img)
         numpy.testing.assert_array_equal(y.as_array(), img.as_array())
 
@@ -107,10 +107,10 @@ class TestOperator(CCPiTestClass):
         
         G = Gradient(ig)
         
-        uid = Id.domain_geometry().allocate(ImageGeometry.RANDOM_INT)
+        uid = Id.domain_geometry().allocate(ImageGeometry.RANDOM_INT, seed=1)
         
-        a = LinearOperator.PowerMethod(Id, 10, uid)
-        b = LinearOperator.PowerMethodNonsquare(Id, 10, uid)
+        a = LinearOperator.PowerMethod(Id, 1000, uid)
+        b = LinearOperator.PowerMethodNonsquare(Id, 1000, uid)
         
         print ("Edo impl", a[0])
         print ("old impl", b[0])
@@ -118,8 +118,8 @@ class TestOperator(CCPiTestClass):
         #self.assertAlmostEqual(a[0], b[0])
         self.assertNumpyArrayAlmostEqual(a[0],b[0],decimal=6)
         
-        a = LinearOperator.PowerMethod(G, 10, uid)
-        b = LinearOperator.PowerMethodNonsquare(G, 10, uid)
+        a = LinearOperator.PowerMethod(G, 1000, uid)
+        b = LinearOperator.PowerMethodNonsquare(G, 1000, uid)
         
         print ("Edo impl", a[0])
         print ("old impl", b[0])