Skip to content

Commit 6861d83

Browse files
committed
testing the tikhonov SVD module. not working yet, there is a problem with the UI
1 parent 84f0348 commit 6861d83

File tree

6 files changed

+409
-415
lines changed

6 files changed

+409
-415
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ SCIRun::Core::Datatypes::DenseMatrix SolveInverseProblemWithTikhonovSVD_impl::co
9797
DenseMatrix solution(DenseMatrix::Zero(N,numTimeSamples));
9898
DenseMatrix tempInverse(DenseMatrix::Zero(N,M));
9999

100-
int x = 0;
101-
102100
// Compute inverse solution
103101
for (int rr=0; rr<rank ; rr++)
104102
{

src/Interface/Modules/Inverse/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
#
2929

3030
SET(Interface_Modules_Inverse_FORMS
31+
SolveInverseProblemWithTikhonovSVDDialog.ui
3132
SolveInverseProblemWithTikhonov.ui
32-
SolveInverseProblemWithTikhonovSVDDialog.ui
3333
)
3434

3535
SET(Interface_Modules_Inverse_HEADERS
36-
SolveInverseProblemWithTikhonovDialog.h
3736
SolveInverseProblemWithTikhonovSVDDialog.h
37+
SolveInverseProblemWithTikhonovDialog.h
3838
share.h
3939
)
4040

4141
SET(Interface_Modules_Inverse_SOURCES
42-
SolveInverseProblemWithTikhonovDialog.cc
4342
SolveInverseProblemWithTikhonovSVDDialog.cc
43+
SolveInverseProblemWithTikhonovDialog.cc
4444
)
4545

4646
QT4_WRAP_UI(Interface_Modules_Inverse_FORMS_HEADERS ${Interface_Modules_Inverse_FORMS})

src/Interface/Modules/Inverse/SolveInverseProblemWithTikhonovSVDDialog.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ SolveInverseProblemWithTikhonovSVDDialog::SolveInverseProblemWithTikhonovSVDDial
4444
setWindowTitle(QString::fromStdString(name));
4545
fixSize();
4646

47+
GuiStringTranslationMap lambdaMethod_;
4748
lambdaMethod_.insert(StringPair("Direct entry", "single"));
4849
lambdaMethod_.insert(StringPair("Slider", "slider"));
4950
lambdaMethod_.insert(StringPair("L-curve", "lcurve"));
@@ -57,6 +58,9 @@ SolveInverseProblemWithTikhonovSVDDialog::SolveInverseProblemWithTikhonovSVDDial
5758
addDoubleSpinBoxManager(lambdaMaxDoubleSpinBox_, Parameters::LambdaMax);
5859
addDoubleSpinBoxManager(lambdaResolutionDoubleSpinBox_, Parameters::LambdaResolution);
5960

61+
// addDoubleLineEditManager(lCurveMinLineEdit_, Parameters::LambdaMin);
62+
// addDoubleLineEditManager(lCurveMaxLineEdit_, Parameters::LambdaMax);
63+
6064
addDoubleSpinBoxManager(lambdaSliderDoubleSpinBox_, Parameters::LambdaSliderValue);
6165

6266
addRadioButtonGroupManager({ autoRadioButton_, underRadioButton_, overRadioButton_ }, Parameters::regularizationChoice);
@@ -73,6 +77,7 @@ SolveInverseProblemWithTikhonovSVDDialog::SolveInverseProblemWithTikhonovSVDDial
7377
connect(lambdaResolutionDoubleSpinBox_, SIGNAL(valueChanged(double)), this, SLOT(setSliderStep(double)));
7478
}
7579

80+
7681
void SolveInverseProblemWithTikhonovSVDDialog::setSpinBoxValue(int value)
7782
{
7883
lambdaSliderDoubleSpinBox_->setValue(value);

0 commit comments

Comments
 (0)