MRG: Merge branch 'shark_kmeans'

da070cc1 · Ludovic Hussonnois · 91ac3210 · 5c21df17 · da070cc1 · da070cc1
Commit da070cc1 authored 7 years ago by Ludovic Hussonnois
--- a/Baseline/OTB-Applications/Files/apTvComputeContingencyTableExtraProdLabelsROut.csv
+++ b/Baseline/OTB-Applications/Files/apTvComputeContingencyTableExtraProdLabelsROut.csv
+labels,1,2,3,4
+2,1182,61882,981,1872
+3,23103,9573,115085,886
+4,0,6238,9648,11093
+
--- a/Baseline/OTB-Applications/Images/clSHARKKMLabeledImageQB1.tif
+++ b/Baseline/OTB-Applications/Images/clSHARKKMLabeledImageQB1.tif
--- a/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterConfidence.tif
+++ b/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterConfidence.tif
--- a/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterOutput.tif
+++ b/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterOutput.tif
--- a/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterWithMaskConfidence.tif
+++ b/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterWithMaskConfidence.tif
--- a/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterWithMaskOutput.tif
+++ b/Baseline/OTB/Images/leSharkUnsupervisedImageClassificationFilterWithMaskOutput.tif
--- a/Input/Classification/clSHARKKM_ModelQB1.txt
+++ b/Input/Classification/clSHARKKM_ModelQB1.txt
+#HardClusteringModel
+22 serialization::archive 10 0 0 0 0 0 0 1 0
+0 1 1 0 1 5 1 0
+1 2 4
+2 8 0 -1.0226082923888695 -0.66188560008340058 -0.58710065263947875 1.1845956969580402 0.33038114061794266 0.21383996310386788 0.18967867239121625 -0.38271553286336624
--- a/Input/Classification/otbSharkImageClassificationFilter_KMeansmodel.txt
+++ b/Input/Classification/otbSharkImageClassificationFilter_KMeansmodel.txt
+#HardClusteringModel
+22 serialization::archive 10 0 0 0 0 0 0 1 0
+0 1 1 0 1 5 1 0
+1 2 4
+2 8 0 -1.0226082923888695 -0.66188560008340058 -0.58710065263947875 1.1845956969580402 0.33038114061794266 0.21383996310386788 0.18967867239121625 -0.38271553286336624
--- a/Input/Classification/shark_km_model.txt
+++ b/Input/Classification/shark_km_model.txt
+#HardClusteringModel
+22 serialization::archive 10 0 0 0 0 0 0 1 0
+0 1 1 0 1 5 1 0
+1 3 16
+2 48 0 -0.75135115517012463 -0.69598403557019761 -0.77291333075287716 -0.66245397309685394 -0.67372535309765269 0.083428094937306838 -0.45399152115386815 0.20990782930767279 0.10485965898590345 -0.21791773895282068 -0.37589268458057445 0.24891045945733534 -0.43887303104968284 -0.37724339197237816 -0.18981777893398705 0.26062175518877922 0.74834989693617437 0.71676965746623933 0.7739950119549428 0.72559001352663099 0.85327354523562415 0.28765717145350461 -0.20726728456108015 0.060341732426436492 -0.012405900435800697 -0.04518887520532628 -0.22454753408110234 0.023504816230351441 0.58563845542217197 -0.14164478659113913 0.53966021216813309 0.063897047526369238 -0.070617835595784398 -0.11100984483909543 -0.080710889802309962 -0.18954047981165548 -0.41592560665451356 -0.70950382267668632 1.233250179153706 -0.50153800918537117 -0.16821708118848716 0.48690282387657285 1.1235200101487335 -0.50176110492197579 -0.32860791738436551 0.96559264382867449 -0.69619598866976273 -0.60138175157878504