adapting the conflicts from merge. Also fixed a bunch of badly defined parameters

Author: jcollfont

src/Core/Algorithms/Legacy/Inverse/CMakeLists.txt

@@ -48,6 +48,7 @@ SCIRUN_ADD_LIBRARY(Algorithms_Legacy_Inverse
 TARGET_LINK_LIBRARIES(Algorithms_Legacy_Inverse
   Core_Datatypes #matrices
   Core_Datatypes_Legacy_Field
+  Algorithms_Math
   Core_Geometry_Primitives  #vectors
   Core_Basis #field basis
   Core_Algorithms_Legacy_Fields

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

@@ -44,10 +44,13 @@ Last modification : April 20 2017
 #include <Core/Datatypes/DenseColumnMatrix.h>
 #include <Core/Datatypes/SparseRowMatrix.h>
 #include <Core/Datatypes/MatrixTypeConversions.h>
+#include <Core/Math/MiscMath.h>
 
 // SCIRun structural
 #include <Core/Algorithms/Base/AlgorithmPreconditions.h>
+#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
 #include <Core/Logging/LoggerInterface.h>
+#include <Core/Logging/Log.h>
 #include <Core/Utils/Exception.h>
 
 using namespace SCIRun;
@@ -66,20 +69,6 @@ const AlgorithmOutputName TikhonovAlgoAbstractBase::InverseSolution("InverseSolu
 const AlgorithmOutputName TikhonovAlgoAbstractBase::RegularizationParameter("RegularizationParameter");
 const AlgorithmOutputName TikhonovAlgoAbstractBase::RegInverse("RegInverse");
 
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::TikhonovImplementation("TikhonovImplementationOption");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::RegularizationMethod("lambdaMethodComboBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::regularizationChoice("regularizationChoice");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaFromDirectEntry("lambdaDoubleSpinBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaMin("lambdaMinDoubleSpinBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaMax("lambdaMaxDoubleSpinBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaNum("lambdaNumberSpinBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaResolution("lambdaResolutionDoubleSpinBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaSliderValue("lambdaSliderDoubleSpinBox");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LambdaCorner("lCurveLambdaLineEdit");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::LCurveText("lCurveTextEdit");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::regularizationSolutionSubcase("solutionConstraintRadioButton");
-// const AlgorithmParameterName TikhonovAlgoAbstractBase::regularizationResidualSubcase("residualConstraintRadioButton");
-
 ALGORITHM_PARAMETER_DEF( Inverse, TikhonovImplementation);
 ALGORITHM_PARAMETER_DEF( Inverse, RegularizationMethod);
 ALGORITHM_PARAMETER_DEF( Inverse, regularizationChoice);
@@ -96,10 +85,12 @@ ALGORITHM_PARAMETER_DEF( Inverse, regularizationResidualSubcase);
 
 TikhonovAlgoAbstractBase::TikhonovAlgoAbstractBase()
 {
-	addParameter(Parameters::TikhonovImplementation, "NoMethodSelected");
-	addParameter(Parameters::RegularizationMethod, "lcurve");
-	addParameter(Parameters::regularizationChoice, "automatic");
-	addParameter(Parameters::LambdaFromDirectEntry,1e-6);
+ 	using namespace Parameters;
+
+	addParameter(TikhonovImplementation, "NoMethodSelected" );
+	addOption(RegularizationMethod, "lcurve", "single|slider|lcurve");
+	addParameter(regularizationChoice, 0);
+	addParameter(LambdaFromDirectEntry,1e-6);
 	// addParameter(lambdaDoubleSpinBox,1e-6);
 	addParameter(Parameters::LambdaMin,1e-6);
 	addParameter(Parameters::LambdaMax,1);
@@ -198,15 +189,14 @@ bool TikhonovAlgoAbstractBase::checkInputMatrixSizes( const AlgorithmInput & inp
 /////////  run()
 AlgorithmOutput TikhonovAlgoAbstractBase::run(const AlgorithmInput & input) const
 {
-	THROW_ALGORITHM_PROCESSING_ERROR("We got to run");
 	// get inputs
 	auto forwardMatrix_ = input.get<Matrix>(TikhonovAlgoAbstractBase::ForwardMatrix);
 	auto measuredData_ = input.get<Matrix>(TikhonovAlgoAbstractBase::MeasuredPotentials);
 	auto sourceWeighting_ = input.get<Matrix>(TikhonovAlgoAbstractBase::WeightingInSourceSpace);
 	auto sensorWeighting_ = input.get<Matrix>(TikhonovAlgoAbstractBase::WeightingInSensorSpace);
 
 	// get Parameters
-	auto RegularizationMethod_gotten = get(Parameters::RegularizationMethod).toString();
+	auto RegularizationMethod_gotten = getOption(Parameters::RegularizationMethod);
 	auto TikhonovImplementation_gotten = get(Parameters::TikhonovImplementation).toString();
 
     // Alocate Variable
@@ -219,18 +209,19 @@ AlgorithmOutput TikhonovAlgoAbstractBase::run(const AlgorithmInput & input) cons
 
 	// Determine specific Tikhonov Implementation
 	TikhonovImpl  *algoImpl;
-	if ( get(Parameters::RegularizationMethod).toInt() ==  standardTikhonov ){
+	std::cout << "Selecting Tikhonov: " << TikhonovImplementation_gotten << std::endl;
+	if ( TikhonovImplementation_gotten ==  "standardTikhonov" ){
 		// get Parameters
 		int  regularizationChoice_ = get(Parameters::regularizationChoice).toInt();
 		int regularizationSolutionSubcase_ = get(Parameters::regularizationSolutionSubcase).toInt();
 		int regularizationResidualSubcase_ = get(Parameters::regularizationResidualSubcase).toInt();
 
 		algoImpl = new SolveInverseProblemWithStandardTikhonovImpl( *castMatrix::toDense(forwardMatrix_), *castMatrix::toDense(measuredData_), *castMatrix::toDense(sourceWeighting_), *castMatrix::toDense(sensorWeighting_), regularizationChoice_, regularizationSolutionSubcase_, regularizationResidualSubcase_);
 	}
-	else if ( get(Parameters::RegularizationMethod).toInt() ==  TikhonovSVD ){
+	else if ( TikhonovImplementation_gotten ==  "TikhonovSVD" ){
 		// algoImpl = new SolveInverseProblemWithTikhonovSVD_impl( *castMatrix::toDense(forwardMatrix_), *castMatrix::toDense(measuredData_), *castMatrix::toDense(sourceWeighting_), *castMatrix::toDense(sensorWeighting_));
 	}
-	else if ( get(Parameters::RegularizationMethod).toInt() ==  TikhonovTSVD ){
+	else if ( TikhonovImplementation_gotten==  "TikhonovTSVD" ){
 		THROW_ALGORITHM_PROCESSING_ERROR("Tikhonov TSVD not implemented yet");
 	}
 	else{

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

@@ -39,6 +39,7 @@ namespace Core {
 namespace Algorithms {
 namespace Inverse {
 
+
 	ALGORITHM_PARAMETER_DECL(TikhonovImplementation);
 	ALGORITHM_PARAMETER_DECL(RegularizationMethod);
 	ALGORITHM_PARAMETER_DECL(regularizationChoice);
@@ -69,21 +70,6 @@ namespace Inverse {
 		static const AlgorithmOutputName RegularizationParameter;
 		static const AlgorithmOutputName RegInverse;
 
-		// define parameter names
-		// static  const AlgorithmParameterName TikhonovImplementation;
-		// static  const AlgorithmParameterName RegularizationMethod;
-		// static  const AlgorithmParameterName regularizationChoice;
-		// static  const AlgorithmParameterName regularizationSolutionSubcase;
-		// static  const AlgorithmParameterName regularizationResidualSubcase;
-		// static  const AlgorithmParameterName LambdaFromDirectEntry;
-		// static  const AlgorithmParameterName LambdaMin;
-		// static  const AlgorithmParameterName LambdaMax;
-		// static  const AlgorithmParameterName LambdaNum;
-		// static  const AlgorithmParameterName LambdaResolution;
-		// static  const AlgorithmParameterName LambdaSliderValue;
-		// static  const AlgorithmParameterName LambdaCorner;
-		// static  const AlgorithmParameterName LCurveText;
-
 		// Define algorithm choices
 		enum TikhonovImplementationChoice {
 			NoMethodSelected,