comparison transform/FeatureExtractionModelTransformer.cpp @ 1777:d484490cdf69

Split EditableDenseThreeDimensionalModel into explicitly compressed and uncompressed variants. Simplifies the uncompressed version, and we may want to consider whether we need the compressed one at all.

 #include "data/model/Model.h"
 #include "base/Window.h"
 #include "base/Exceptions.h"
 #include "data/model/SparseOneDimensionalModel.h"
 #include "data/model/SparseTimeValueModel.h"
-#include "data/model/EditableDenseThreeDimensionalModel.h"
+#include "data/model/BasicCompressedDenseThreeDimensionalModel.h"
 #include "data/model/DenseTimeValueModel.h"
 #include "data/model/NoteModel.h"
 #include "data/model/RegionModel.h"
 #include "data/model/FFTModel.h"
 #include "data/model/WaveFileModel.h"

 
         // Anything that is not a 1D, note, or interval model and that
         // has a fixed sample rate and more than one value per result
         // must be a dense 3D model.
 
-        EditableDenseThreeDimensionalModel *model =
-            new EditableDenseThreeDimensionalModel
-            (modelRate, modelResolution, binCount,
-             EditableDenseThreeDimensionalModel::BasicMultirateCompression,
-             false);
+        auto model =
+            new BasicCompressedDenseThreeDimensionalModel
+            (modelRate, modelResolution, binCount, false);
 
         if (!m_descriptors[n].binNames.empty()) {
             std::vector<QString> names;
             for (int i = 0; i < (int)m_descriptors[n].binNames.size(); ++i) {
                 names.push_back(m_descriptors[n].binNames[i].c_str());

                                        duration,
                                        feature.label.c_str()));
             }
         }
 
-    } else if (isOutputType<EditableDenseThreeDimensionalModel>(n)) {
+    } else if (isOutputType<BasicCompressedDenseThreeDimensionalModel>(n)) {
 
         auto model = ModelById::getAs
-            <EditableDenseThreeDimensionalModel>(outputId);
+            <BasicCompressedDenseThreeDimensionalModel>(outputId);
         if (!model) return;
         
         DenseThreeDimensionalModel::Column values = feature.values;
         
         if (!feature.hasTimestamp && m_fixedRateFeatureNos[n] >= 0) {

     (void)
         (setOutputCompletion<SparseOneDimensionalModel>(n, completion) ||
          setOutputCompletion<SparseTimeValueModel>(n, completion) ||
          setOutputCompletion<NoteModel>(n, completion) ||
          setOutputCompletion<RegionModel>(n, completion) ||
-         setOutputCompletion<EditableDenseThreeDimensionalModel>(n, completion));
-}
-
+         setOutputCompletion<BasicCompressedDenseThreeDimensionalModel>(n, completion));
+}
+