removed use_predictions option from classifiers

Author: jpswinski

datasets/bathy/package/BathyCoastnetClassifier.cpp

@@ -128,7 +128,7 @@ bool BathyCoastnetClassifier::run (GeoDataFrame* dataframe)
                 .h5_index = 0,
                 .x = x_atc[i],
                 .z = geoid_corr_h[i],
-                .cls = static_cast<size_t>(class_ph[i]),
+                .cls = 0,
                 .prediction = BathyFields::UNCLASSIFIED,
                 .surface_elevation = 0.0,
                 .bathy_elevation = 0.0
@@ -144,7 +144,7 @@ bool BathyCoastnetClassifier::run (GeoDataFrame* dataframe)
 
         // Run classification
         const string model_filename = FString("%s/%s", ContainerRunner::HOST_DIRECTORY, args.model.value.c_str()).c_str();
-        const auto results = classify (args.verbose, samples, model_filename, args.usePredictions);
+        const auto results = classify (args.verbose, samples, model_filename, false);
 
         // Update extents
         for(size_t i = 0; i < number_of_samples; i++)

datasets/bathy/package/BathyFields.h

@@ -122,14 +122,12 @@ struct CoastnetFields: public FieldDictionary
     FieldElement<string>  model             {COASTNET_MODEL};
     FieldElement<bool>    setClass          {true};
     FieldElement<bool>    setSurface        {true};
-    FieldElement<bool>    usePredictions    {false};
     FieldElement<bool>    verbose           {true};
 
     CoastnetFields(void):
         FieldDictionary({ {"model",             &model},
                           {"set_class",         &setClass},
                           {"set_surface",       &setSurface},
-                          {"use_predictions",   &usePredictions},
                           {"verbose",           &verbose} }) {
     };
 
@@ -143,13 +141,11 @@ struct OpenOceansPPFields: public FieldDictionary
 {
     FieldElement<bool>      setClass                {false};
     FieldElement<bool>      setSurface              {false};
-    FieldElement<bool>      usePredictions          {false};
     FieldElement<bool>      verbose                 {true};
 
     OpenOceansPPFields(void):
         FieldDictionary({ {"set_class",                 &setClass},
                           {"set_surface",               &setSurface},
-                          {"use_predictions",           &usePredictions},
                           {"verbose",                   &verbose} }) {};
 
     virtual ~OpenOceansPPFields(void) override = default;

datasets/bathy/package/BathyOpenOceansPPClassifier.cpp

@@ -124,7 +124,7 @@ bool BathyOpenOceansPPClassifier::run (GeoDataFrame* dataframe)
                 .x = x_atc[i],
                 .z = geoid_corr_h[i],
                 .cls = 0,
-                .prediction = static_cast<unsigned>(class_ph[i]),
+                .prediction = BathyFields::UNCLASSIFIED,
                 .surface_elevation = 0.0,
                 .bathy_elevation = 0.0
             };
@@ -139,7 +139,7 @@ bool BathyOpenOceansPPClassifier::run (GeoDataFrame* dataframe)
 
         // Run classification
         const oopp::params params;
-        samples = classify (samples, params, args.usePredictions);
+        samples = classify (samples, params, false);
 
         // Update extents
         for(size_t i = 0; i < number_of_samples; i++)