Commits

Rashad M committed 6190f3b

TEST: Updating INPUTDATA for inxml and removing dependency

  • Participants
  • Parent commits a7c1866

Comments (0)

Files changed (1)

Testing/Applications/Classification/CMakeLists.txt

     OTB_TEST_APPLICATION(
                          NAME     apTvClTrainMethod${classifier}ImagesClassifierQB1_InXML1
                          APP      TrainImagesClassifier
-                         OPTIONS  -inxml ${BASELINE_FILES}/cl${classifier}_OutXML1.xml
+                         OPTIONS  -inxml ${INPUTDATA}/cl${classifier}_OutXML1.xml
+                                  -io.out ${TEMP}/OutXML2_${OUTMODELFILE}
 
                          VALID    ${ascii_comparison}
                                   ${ascii_ref_path}/${OUTMODELFILE}
-                                  ${TEMP}/OutXML1_${OUTMODELFILE}
+                                  ${TEMP}/OutXML2_${OUTMODELFILE}
                          )
 
     OTB_TEST_APPLICATION(
                       APP  TrainImagesClassifier
                       OPTIONS -io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
                               -io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
-                              -io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+                              -io.imstat ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB1.xml
                               -classifier libsvm
                               -classifier.libsvm.opt true
                               -io.out ${TEMP}/clsvmModelQB1_OutXML.svm
                               ${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
                               ${TEMP}/clsvmModelQB1_OutXML.svm)
 
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_OutXML PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
-
-
-OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1_InXML1
-                      APP  TrainImagesClassifier
-                      OPTIONS -inxml ${BASELINE_FILES}/clsvmModelQB1_OutXML.xml
-                              -rand 121212
-                      VALID   --compare-ascii ${NOTOL}
-                              ${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
-                              ${TEMP}/clsvmModelQB1_OutXML.svm)
-
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_InXML1 PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
+#SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_OutXML PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
+#because ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB1.xml == ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
 
 OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1_allOpt
                       APP  TrainImagesClassifier
   
 SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_allOpt PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
 
-
 OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1_allOpt_InXML
                       APP  TrainImagesClassifier
-                      OPTIONS -inxml ${BASELINE_FILES}/clsvmModelQB1_OutXML.xml
+                      OPTIONS -inxml ${INPUTDATA}/clsvmModelQB1_OutXML.xml
                               -sample.mv 100
                               -sample.mt 100
                               -sample.vtr 0.5
                               ${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
                               ${TEMP}/clsvmModelQB1_allOpt_InXML.svm)
 
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_allOpt_InXML PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
-
+#SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_allOpt_InXML PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
+#because ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB1.xml == ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB1
                       APP  ImageClassifier
 
 SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB3 PROPERTIES DEPENDS apTvClTrainSVMImagesClassifierQB1)
 
-
-OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB3_OutXML
-                      APP  ImageClassifier
-                      OPTIONS -in      ${INPUTDATA}/Classification/QB_3_ortho.tif
-                              -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-                              -model   ${TEMP}/clsvmModelQB1.svm
-                              -out     ${TEMP}/clLabeledImageQB3.tif
-                              -outxml  ${TEMP}/clLabeledImageQB3_OutXML.xml
-                      VALID   --compare-image ${NOTOL}
-                              ${OTBAPP_BASELINE}/clLabeledImageQB3.tif
-                              ${TEMP}/clLabeledImageQB3.tif)
-
-SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB3_OutXML PROPERTIES DEPENDS apTvClTrainSVMImagesClassifierQB1)
-
-
-OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB3_InXML
-                      APP  ImageClassifier
-                      OPTIONS -inxml  ${BASELINE_FILES}/clLabeledImageQB3_OutXML.xml
-                      VALID   --compare-image ${NOTOL}
-                              ${OTBAPP_BASELINE}/clLabeledImageQB3.tif
-                              ${TEMP}/clLabeledImageQB3.tif)
-
-SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB3_InXML PROPERTIES DEPENDS apTvClTrainSVMImagesClassifierQB1)
-
 #--------
 # QB multi chain