From 6d151aaf42ef686e19afad834fc5269f98864427 Mon Sep 17 00:00:00 2001 From: Cyrille Valladeau <cyrille.valladeau@c-s.fr> Date: Tue, 6 May 2008 08:26:12 +0000 Subject: [PATCH] Tests Markov, exemple modofie. --- Code/Markov/otbMarkovClassificationFilter.h | 6 +++--- Examples/Markov/MarkovClassification1Example.cxx | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Code/Markov/otbMarkovClassificationFilter.h b/Code/Markov/otbMarkovClassificationFilter.h index 7232b56b78..0b4eef257a 100644 --- a/Code/Markov/otbMarkovClassificationFilter.h +++ b/Code/Markov/otbMarkovClassificationFilter.h @@ -80,8 +80,8 @@ public itk::ImageToImageFilter<TInputImage,TClassifiedImage> typedef typename TInputImage::RegionType InputImageRegionType; /** Type definition for the input image region iterator */ - typedef itk::ImageRegionIterator<TInputImage> InputImageRegionIterator; - typedef itk::ImageRegionConstIterator<TInputImage> InputImageRegionConstIterator; + typedef itk::ImageRegionIterator<TInputImage> InputImageRegionIterator; + typedef itk::ImageRegionConstIterator<TInputImage> InputImageRegionConstIterator; /** Image dimension */ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension); @@ -150,7 +150,7 @@ public itk::ImageToImageFilter<TInputImage,TClassifiedImage> typedef MRFEnergy< TClassifiedImage, TClassifiedImage> EnergyRegularizationType; typedef MRFEnergy< TInputImage, TClassifiedImage> EnergyFidelityType; typedef typename EnergyRegularizationType::Pointer EnergyRegularizationPointer; - typedef typename EnergyFidelityType::Pointer EnergyFidelityPointer; + typedef typename EnergyFidelityType::Pointer EnergyFidelityPointer; // typedef RandomMRFSampler< TInputImage, TClassifiedImage> SamplerType; // typedef MRFSamplerMAP< TInputImage, TClassifiedImage> SamplerType; diff --git a/Examples/Markov/MarkovClassification1Example.cxx b/Examples/Markov/MarkovClassification1Example.cxx index 46c5167940..004ae96ea3 100644 --- a/Examples/Markov/MarkovClassification1Example.cxx +++ b/Examples/Markov/MarkovClassification1Example.cxx @@ -261,8 +261,11 @@ int main(int argc, char* argv[] ) parameters[6]=220.0;//Class 3 mean parameters[7]=10.0; //Class 3 stde energyFidelity->SetParameters(parameters); -// optimizer->SetTemperature(atof(argv[6])); - optimizer->SetParameters(atof(argv[6])); + optimizer->SetTemperature(atof(argv[6])); + itk::Array<double> array(1); + array.Fill(atof(argv[6])); + //optimizer->SetParameters(array); + markovFilter->SetValueInsteadRandom(500); // Unable rand() calculation markovFilter->SetNumberOfClasses(nClass); markovFilter->SetMaximumNumberOfIterations(atoi(argv[5])); markovFilter->SetErrorTolerance(-1.0); -- GitLab