multiple time instances implemented. Had to fix some bugs in Tikhonv SVD and TSVD

Author: jcollfont

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

@@ -75,7 +75,7 @@ using namespace SCIRun::Core::Algorithms::Inverse;
         const int numTimeSamples = y.ncols();
         DenseMatrix inverseG(sizeB,sizeB);
 
-        DenseColumnMatrix b(sizeB);
+        DenseMatrix b(sizeB);
         DenseMatrix solution(sizeSolution,numTimeSamples);
         DenseMatrix G;
 

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

@@ -125,10 +125,10 @@ SCIRun::Core::Datatypes::DenseMatrix SolveInverseProblemWithTikhonovSVD_impl::co
         {
             // evaluate filter factor
                 double singVal = svd_SingularValues[rr];
-                double filterFactor_i =  singVal / ( lambda * lambda + singVal * singVal ) * Uy(rr);
+                double filterFactor_i =  singVal / ( lambda * lambda + singVal * singVal );
 
             // u[date solution
-                solution += filterFactor_i * svd_MatrixV.col(rr);
+                solution += filterFactor_i * svd_MatrixV.col(rr) * Uy.row(rr);
 
             // update inverse operator
                 if (inverseCalculation)

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

@@ -128,10 +128,10 @@ SCIRun::Core::Datatypes::DenseMatrix SolveInverseProblemWithTikhonovTSVD_impl::c
         {
             // evaluate filter factor
                 double singVal = svd_SingularValues[rr];
-                double filterFactor_i =  1 / ( singVal ) * Uy(rr);
+                auto filterFactor_i =  1 / ( singVal );
 
             // u[date solution
-                solution += filterFactor_i * svd_MatrixV.col(rr);
+                solution += filterFactor_i * svd_MatrixV.col(rr) * Uy.row(rr);
 
             // update inverse operator
                 if (inverseCalculation)

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

@@ -132,12 +132,12 @@ bool TikhonovAlgoAbstractBase::checkInputMatrixSizes( const AlgorithmInput & inp
 		return false;
     }
 
-    // check that number of time samples is 1. @JCOLLFONT to change for a more general case later (should add a for loop)
-    if (1 != measuredData_->ncols())
-    {
-		THROW_ALGORITHM_INPUT_ERROR("Measured data must be a vector");
-		return false;
-    }
+    // // check that number of time samples is 1. @JCOLLFONT to change for a more general case later (should add a for loop)
+    // if (1 != measuredData_->ncols())
+    // {
+	// 	THROW_ALGORITHM_INPUT_ERROR("Measured data must be a vector");
+	// 	return false;
+    // }
 
     // check source regularization matrix sizes
     if (sourceWeighting_)

src/Modules/Legacy/Inverse/SolveInverseProblemWithTikhonovTSVD.cc

@@ -127,8 +127,8 @@ void SolveInverseProblemWithTikhonovTSVD::execute()
 		setAlgoOptionFromState(Parameters::RegularizationMethod);
 		setAlgoDoubleFromState(Parameters::LambdaFromDirectEntry);
 		// state->setValue(Parameters::LambdaMin,1);
-		// state->setValue(Parameters::LambdaMax,double(rank)); // casting to double to keep consistency across tikhonov types
-		// state->setValue(Parameters::LambdaNum, rank);	// casting to double to keep consistency across tikhonov types
+		state->setValue(Parameters::LambdaMax,double(rank)); // casting to double to keep consistency across tikhonov types
+		state->setValue(Parameters::LambdaNum, rank);	// casting to double to keep consistency across tikhonov types
 		// state->setValue( Parameters::LambdaResolution, 1);
 		setAlgoDoubleFromState(Parameters::LambdaMin);
 		setAlgoDoubleFromState(Parameters::LambdaMax);