tried playing with the parameter declaration…

Author: jcollfont

src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovImpl_child.cc

@@ -85,11 +85,11 @@ using namespace SCIRun::Core::Algorithms::Inverse;
 
         solution = M3 * b;
 
-        if (inverseCalculation)
-        {
-            inverseG = G.inverse().eval();
-            inverseMatrix_.reset( new DenseMatrix( (M3 * inverseG) * M4) );
-        }
+        // if (inverseCalculation)
+        // {
+        //     inverseG = G.inverse().eval();
+        //     inverseMatrix_.reset( new DenseMatrix( (M3 * inverseG) * M4) );
+        // }
         //     inverseSolution_.reset(new DenseMatrix(solution));
         return solution;
     }

src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovImpl_child.h

@@ -52,11 +52,7 @@ namespace SCIRun {
 			    {
 
 			    public:
-			        SolveInverseProblemWithTikhonovImpl_child() : TikhonovAlgoAbstractBase()
-						{
-							// prealocate matrices needed for computation
-				        	preAlocateInverseMatrices();
-						};
+			        SolveInverseProblemWithTikhonovImpl_child() {};
 
 			    private:
 

src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovSVD_impl.cc

@@ -45,7 +45,7 @@
 #include <Core/Utils/Exception.h>
 
 // Tikhonov inverse libraries
-#include <Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.h>
+// #include <Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.h>
 // #include <Modules/Legacy/Inverse/SolveInverseProblemWithTikhonovSVD.h>
 #include <Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovSVD_impl.h>
 
@@ -121,8 +121,8 @@ SCIRun::Core::Datatypes::DenseColumnMatrix SolveInverseProblemWithTikhonovSVD_im
         }
 
     // output solutions
-      if (inverseCalculation)
-          inverseMatrix_.reset( new SCIRun::Core::Datatypes::DenseMatrix(tempInverse) );
+    //   if (inverseCalculation)
+    //       inverseMatrix_.reset( new SCIRun::Core::Datatypes::DenseMatrix(tempInverse) );
 
         return solution;
 }

src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovSVD_impl.h

@@ -48,46 +48,39 @@
 #include <Core/Algorithms/Legacy/Inverse/share.h>
 
 
-namespace SCIRun
-{
-	namespace Core
-	{
-		namespace Algorithms
-		{
-			namespace Inverse
-			{
+namespace SCIRun {
+namespace Core {
+namespace Algorithms {
+namespace Inverse {
 
-			    class SCISHARE SolveInverseProblemWithTikhonovSVD_impl : public TikhonovAlgoAbstractBase
-			    {
+		    class SCISHARE SolveInverseProblemWithTikhonovSVD_impl : public TikhonovAlgoAbstractBase
+		    {
 
 
-			    public:
-			        SolveInverseProblemWithTikhonovSVD_impl() : TikhonovAlgoAbstractBase()
-			                                        {
-			                                            rank = 0;
-			                                        };
+		    public:
+		        SolveInverseProblemWithTikhonovSVD_impl()
+		                                        {
+		                                            rank = 0;
+		                                        };
 
 
-			    private:
+		    private:
 
-			        int rank;
-			        Eigen::JacobiSVD<SCIRun::Core::Datatypes::DenseMatrix::EigenBase> SVDdecomposition;
-			//        const SCIRun::Core::Datatypes::DenseMatrix matrixU_;
-			//        const SCIRun::Core::Datatypes::DenseColumnMatrix matrixS_;
-			//        const SCIRun::Core::Datatypes::DenseMatrix matrixV_;
-			//        SCIRun::Core::Datatypes::DenseMatrix y;
-			        SCIRun::Core::Datatypes::DenseColumnMatrix Uy;
+		        int rank;
+		        Eigen::JacobiSVD<SCIRun::Core::Datatypes::DenseMatrix::EigenBase> SVDdecomposition;
+		//        const SCIRun::Core::Datatypes::DenseMatrix matrixU_;
+		//        const SCIRun::Core::Datatypes::DenseColumnMatrix matrixS_;
+		//        const SCIRun::Core::Datatypes::DenseMatrix matrixV_;
+		//        SCIRun::Core::Datatypes::DenseMatrix y;
+		        SCIRun::Core::Datatypes::DenseColumnMatrix Uy;
 
 
-			        SCIRun::Core::Datatypes::DenseColumnMatrix computeInverseSolution( double lambda_sq, bool inverseCalculation);
-			        void preAlocateInverseMatrices(SCIRun::Core::Datatypes::DenseMatrix& forwardMatrix_,SCIRun::Core::Datatypes::DenseMatrix& measuredData_ ,SCIRun::Core::Datatypes::DenseMatrix& sourceWeighting_,SCIRun::Core::Datatypes::DenseMatrix& sensorWeighting_);
-			        //      bool checkInputMatrixSizes(); // DEFINED IN PARENT, MIGHT WANT TO OVERRIDE SOME OTHER TIME
+		        SCIRun::Core::Datatypes::DenseColumnMatrix computeInverseSolution( double lambda_sq, bool inverseCalculation);
+		        void preAlocateInverseMatrices(SCIRun::Core::Datatypes::DenseMatrix& forwardMatrix_,SCIRun::Core::Datatypes::DenseMatrix& measuredData_ ,SCIRun::Core::Datatypes::DenseMatrix& sourceWeighting_,SCIRun::Core::Datatypes::DenseMatrix& sensorWeighting_);
+		        //      bool checkInputMatrixSizes(); // DEFINED IN PARENT, MIGHT WANT TO OVERRIDE SOME OTHER TIME
 
 
-			    };
-			}
-		}
-	}
-}
+		    };
+}}}}
 
 #endif