Skip to content

Commit 3f798e9

Browse files
jessdtatejessdtate
committed
not building yet
1 parent 27f7e42 commit 3f798e9

File tree

5 files changed

+52
-32
lines changed

5 files changed

+52
-32
lines changed

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Last modification : April 20 2017
4747

4848
// SCIRun structural
4949
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>
50+
#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
5051
#include <Core/Logging/LoggerInterface.h>
5152
#include <Core/Utils/Exception.h>
5253

@@ -80,21 +81,24 @@ const AlgorithmOutputName TikhonovAlgoAbstractBase::RegInverse("RegInverse");
8081
//const AlgorithmParameterName TikhonovAlgoAbstractBase::regularizationSolutionSubcase("solutionConstraintRadioButton");
8182
//const AlgorithmParameterName TikhonovAlgoAbstractBase::regularizationResidualSubcase("residualConstraintRadioButton");
8283

83-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, RegularizationMethod);
84-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, regularizationChoice);
85-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaFromDirectEntry);
86-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaMin);
87-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaMax);
88-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaNum);
89-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaResolution);
90-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaSliderValue);
91-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LambdaCorner);
92-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, LCurveText);
93-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, regularizationSolutionSubcase);
94-
ALGORITHM_PARAMETER_DEF( TikhonovAlgoAbstractBase, regularizationResidualSubcase);
84+
ALGORITHM_PARAMETER_DEF( Inverse, TikhonovImplementation);
85+
ALGORITHM_PARAMETER_DEF( Inverse, RegularizationMethod);
86+
ALGORITHM_PARAMETER_DEF( Inverse, regularizationChoice);
87+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaFromDirectEntry);
88+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaMin);
89+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaMax);
90+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaNum);
91+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaResolution);
92+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaSliderValue);
93+
ALGORITHM_PARAMETER_DEF( Inverse, LambdaCorner);
94+
ALGORITHM_PARAMETER_DEF( Inverse, LCurveText);
95+
ALGORITHM_PARAMETER_DEF( Inverse, regularizationSolutionSubcase);
96+
ALGORITHM_PARAMETER_DEF( Inverse, regularizationResidualSubcase);
9597

9698
TikhonovAlgoAbstractBase::TikhonovAlgoAbstractBase()
9799
{
100+
using namespace Parameters;
101+
98102
addParameter(TikhonovImplementation, NoMethodSelected);
99103
addOption(RegularizationMethod, "lcurve", "single"|"slider"|"lcurve");
100104
addParameter(regularizationChoice, 0);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ namespace Core {
3939
namespace Algorithms {
4040
namespace Inverse {
4141

42+
ALGORITHM_PARAMETER_DECL(TikhonovImplementation);
4243
ALGORITHM_PARAMETER_DECL(RegularizationMethod);
4344
ALGORITHM_PARAMETER_DECL(regularizationChoice);
4445
ALGORITHM_PARAMETER_DECL(regularizationSolutionSubcase);

‎src/Interface/Modules/Inverse/SolveInverseProblemWithTikhonovDialog.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ SolveInverseProblemWithTikhonovDialog::SolveInverseProblemWithTikhonovDialog(con
4343
setupUi(this);
4444
setWindowTitle(QString::fromStdString(name));
4545
fixSize();
46-
46+
47+
GuiStringTranslationMap lambdaMethod_;
4748
lambdaMethod_.insert(StringPair("Direct entry", "single"));
4849
lambdaMethod_.insert(StringPair("Slider", "slider"));
4950
lambdaMethod_.insert(StringPair("L-curve", "lcurve"));

‎src/Interface/Modules/Inverse/SolveInverseProblemWithTikhonovDialog.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ private Q_SLOTS:
5151
void setSliderMin(double value);
5252
void setSliderMax(double value);
5353
void setSliderStep(double value);
54-
private:
55-
GuiStringTranslationMap lambdaMethod_;
5654
};
5755

5856
}

‎src/Modules/Legacy/Inverse/SolveInverseProblemWithTikhonov.cc‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ SolveInverseProblemWithTikhonov::SolveInverseProblemWithTikhonov() : Module(stat
6161

6262
void SolveInverseProblemWithTikhonov::setStateDefaults()
6363
{
64-
// setStateIntFromAlgo(TikhonovAlgoAbstractBase::TikhonovImplementation);
65-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::RegularizationMethod);
66-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::regularizationChoice);
67-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaFromDirectEntry);
68-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaMin);
69-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaMax);
70-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaNum);
71-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaResolution);
72-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaSliderValue);
73-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LambdaCorner);
74-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::LCurveText);
75-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::regularizationSolutionSubcase);
76-
setStateIntFromAlgo(TikhonovAlgoAbstractBase::regularizationResidualSubcase);
64+
setStateIntFromAlgo(Parameters::TikhonovImplementation);
65+
setStateStringFromAlgoOption(Parameters::RegularizationMethod);
66+
setStateIntFromAlgo(Parameters::regularizationChoice);
67+
setStateDoubleFromAlgo(Parameters::LambdaFromDirectEntry);
68+
setStateDoubleFromAlgo(Parameters::LambdaMin);
69+
setStateDoubleFromAlgo(Parameters::LambdaMax);
70+
setStateDoubleFromAlgo(Parameters::LambdaNum);
71+
setStateDoubleFromAlgo(Parameters::LambdaResolution);
72+
setStateDoubleFromAlgo(Parameters::LambdaSliderValue);
73+
setStateIntFromAlgo(Parameters::LambdaCorner);
74+
setStateStringFromAlgo(Parameters::LCurveText);
75+
setStateIntFromAlgo(Parameters::regularizationSolutionSubcase);
76+
setStateIntFromAlgo(Parameters::regularizationResidualSubcase);
7777
}
7878

7979
// execute function
@@ -93,10 +93,26 @@ void SolveInverseProblemWithTikhonov::execute()
9393
{
9494

9595
// set parameters
96-
algo().setOption( TikhonovAlgoAbstractBase::TikhonovImplementation, "standardTikhonov" );
97-
algo().setOption(TikhonovAlgoAbstractBase::regularizationChoice, get_state()->getValue(TikhonovAlgoAbstractBase::regularizationChoice).toString());
98-
algo().setOption(TikhonovAlgoAbstractBase::regularizationSolutionSubcase, get_state()->getValue(TikhonovAlgoAbstractBase::regularizationSolutionSubcase).toString());
99-
algo().setOption(TikhonovAlgoAbstractBase::regularizationResidualSubcase, get_state()->getValue(TikhonovAlgoAbstractBase::regularizationResidualSubcase).toString());
96+
// setAlgoOptionFromState
97+
// algo().setOption( TikhonovAlgoAbstractBase::TikhonovImplementation, "standardTikhonov" );
98+
// algo().setOption(TikhonovAlgoAbstractBase::regularizationChoice, get_state()->getValue(TikhonovAlgoAbstractBase::regularizationChoice).toString());
99+
// algo().setOption(TikhonovAlgoAbstractBase::regularizationSolutionSubcase, get_state()->getValue(TikhonovAlgoAbstractBase::regularizationSolutionSubcase).toString());
100+
// algo().setOption(TikhonovAlgoAbstractBase::regularizationResidualSubcase, get_state()->getValue(TikhonovAlgoAbstractBase::regularizationResidualSubcase).toString());
101+
102+
setAlgoIntFromState(Parameters::TikhonovImplementation);
103+
setAlgoOptionFromState(Parameters::RegularizationMethod);
104+
setAlgoIntFromState(Parameters::regularizationChoice);
105+
setAlgoDoubleFromState(Parameters::LambdaFromDirectEntry);
106+
setAlgoDoubleFromState(Parameters::LambdaMin);
107+
setAlgoDoubleFromState(Parameters::LambdaMax);
108+
setAlgoDoubleFromState(Parameters::LambdaNum);
109+
setAlgoDoubleFromState(Parameters::LambdaResolution);
110+
setAlgoDoubleFromState(Parameters::LambdaSliderValue);
111+
setAlgoIntFromState(Parameters::LambdaCorner);
112+
setAlgoStringFromState(Parameters::LCurveText);
113+
setAlgoIntFromState(Parameters::regularizationSolutionSubcase);
114+
setAlgoIntFromState(Parameters::regularizationResidualSubcase);
115+
100116

101117
// run
102118
// auto output = algo().run( withInputData((ForwardMatrix, forward_matrix_h)(MeasuredPotentials,hMatrixMeasDat)(WeightingInSourceSpace,hMatrixRegMat)(WeightingInSensorSpace, hMatrixNoiseCov)));

0 commit comments

Comments
 (0)