ENH: change test file name

Testing/Fa/otbSVMValidation.cxx → Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx

@@ -91,7 +91,7 @@ int main(int argc, char* argv[])
   TrainingListSampleType::Pointer validationLabels = TrainingListSampleType::New();
 
   // Generate training set
-  std::ofstream training("training.csv");
+  //std::ofstream training("training.csv");
   for(unsigned int i =0; i < nbTrainingSamples; ++i)
   {
     // Generate a positive sample
@@ -105,7 +105,7 @@ int main(int argc, char* argv[])
     trainingSamples->PushBack(pSample);
     trainingLabels->PushBack(label);
 
-    training<<"1 1:"<<pSample[0]<<" 2:"<<pSample[1]<<std::endl;
+    //training<<"1 1:"<<pSample[0]<<" 2:"<<pSample[1]<<std::endl;
 
     // Generate a negative sample
     angle = random->GetVariateWithOpenUpperRange( otb::CONST_2PI );
@@ -117,10 +117,10 @@ int main(int argc, char* argv[])
     trainingSamples->PushBack(nSample);
     trainingLabels->PushBack(label);
 
-    training<<"2 1:"<<nSample[0]<<" 2:"<<nSample[1]<<std::endl;
+    //training<<"2 1:"<<nSample[0]<<" 2:"<<nSample[1]<<std::endl;
 
   }
-  training.close();
+  //training.close();
 
   // Generate validation set
 
@@ -137,7 +137,7 @@ int main(int argc, char* argv[])
       label[0]=1;
       validationSamples->PushBack(pSample);
       validationLabels->PushBack(label);
-    validation<<"1 1:"<<pSample[0]<<" 2:"<<pSample[1]<<std::endl;
+      //validation<<"1 1:"<<pSample[0]<<" 2:"<<pSample[1]<<std::endl;
 
       // Generate a negative sample
       angle = random->GetVariateWithOpenUpperRange( otb::CONST_2PI );
@@ -148,10 +148,10 @@ int main(int argc, char* argv[])
       label[0]=2;
       validationSamples->PushBack(nSample);
       validationLabels->PushBack(label);
-    validation<<"2 1:"<<nSample[0]<<" 2:"<<nSample[1]<<std::endl;
+      //validation<<"2 1:"<<nSample[0]<<" 2:"<<nSample[1]<<std::endl;
 
     }
-  validation.close();
+  //validation.close();
 
   // Learn
   EstimatorType::Pointer estimator = EstimatorType::New();
@@ -163,7 +163,7 @@ int main(int argc, char* argv[])
 //  estimator->SetParametersOptimization(true);
   estimator->Update();
 
-  estimator->SaveModel("model.svm");
+  //estimator->SaveModel("model.svm");
 
   // Classify
   ClassifierType::Pointer validationClassifier = ClassifierType::New();

Testing/Fa/CMakeLists.txt

@@ -260,11 +260,11 @@ ${TEMP}/WriteUnsignedLong.tif
 
 
 # ------- FA 0000209 : SVM Validation issue -------------------------
-ADD_TEST(FA-000209-SVMValidationLinearlySeparableWithoutProbEstimate_OK ${CXX_TEST_PATH}/otbSVMValidation
-otbSVMValidation 500 500 0.0025 0.0075 0.0075 0.0025 0. 0.0025 0. 0.0025 0 0)
+ADD_TEST(FA-000209-SVMValidationLinearlySeparableWithoutProbEstimate_OK ${CXX_TEST_PATH}/0000209-SVMValidationLinearlySeparableProbEstimation
+0000209-SVMValidationLinearlySeparableProbEstimation 500 500 0.0025 0.0075 0.0075 0.0025 0. 0.0025 0. 0.0025 0 0)
 
-ADD_TEST(FA-000209-SVMValidationLinearlySeparableWithProbEstimate_KO ${CXX_TEST_PATH}/otbSVMValidation
-otbSVMValidation 500 500 0.0025 0.0075 0.0075 0.0025 0. 0.0025 0. 0.0025 0 1)
+ADD_TEST(FA-000209-SVMValidationLinearlySeparableWithProbEstimate_KO ${CXX_TEST_PATH}/0000209-SVMValidationLinearlySeparableProbEstimation
+0000209-SVMValidationLinearlySeparableProbEstimation 500 500 0.0025 0.0075 0.0075 0.0025 0. 0.0025 0. 0.0025 0 1)
 
 # -------       Vectorization issue   -----------------------------------
 # FIXME Desactivated until http://bugs.orfeo-toolbox.org/view.php?id=94
@@ -310,7 +310,7 @@ TARGET_LINK_LIBRARIES(SensorModelBorder OTBIO OTBCommon OTBBasicFilters OTBProje
 ADD_EXECUTABLE(WriteUnsignedLong WriteUnsignedLong.cxx)
 TARGET_LINK_LIBRARIES(WriteUnsignedLong OTBIO OTBCommon)
 
-ADD_EXECUTABLE(otbSVMValidation otbSVMValidation.cxx)
-TARGET_LINK_LIBRARIES(otbSVMValidation OTBIO OTBLearning)
+ADD_EXECUTABLE(0000209-SVMValidationLinearlySeparableProbEstimation 0000209-SVMValidationLinearlySeparableProbEstimation.cxx)
+TARGET_LINK_LIBRARIES(0000209-SVMValidationLinearlySeparableProbEstimation OTBIO OTBLearning)
 
 ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )