comparison transform/FeatureExtractionModelTransformer.cpp @ 1752:6d09d68165a4 by-id

Further review of ById: make IDs only available when adding a model to the ById store, not by querying the item directly. This means any id encountered in the wild must have been added to the store at some point (even if later released), which simplifies reasoning about lifecycles

         out->setRDFTypeURI(outputSignalTypeURI);
     }
 
     if (out) {
         out->setSourceModel(getInputModel());
-        ModelById::add(out);
-        m_outputs.push_back(out->getId());
+        m_outputs.push_back(ModelById::add(out));
     }
 }
 
 void
 FeatureExtractionModelTransformer::awaitOutputModels()

                                  false);
 
     additional->setScaleUnits(baseModel->getScaleUnits());
     additional->setRDFTypeURI(baseModel->getRDFTypeURI());
 
-    ModelId additionalId = additional->getId();
-    ModelById::add(std::shared_ptr<SparseTimeValueModel>(additional));
+    ModelId additionalId = ModelById::add
+        (std::shared_ptr<SparseTimeValueModel>(additional));
     m_additionalModels[n][binNo] = additionalId;
     return additionalId;
 }
 
 void

             usleep(500000);
         }
     }
     if (m_abandoned) return;
 
-    auto input = ModelById::getAs<DenseTimeValueModel>(getInputModel());
+    ModelId inputId = getInputModel();
+    auto input = ModelById::getAs<DenseTimeValueModel>(inputId);
     if (!input) {
         abandon();
         return;
     }
 

     std::vector<FFTModel *> fftModels;
 
     if (frequencyDomain) {
         for (int ch = 0; ch < channelCount; ++ch) {
             FFTModel *model = new FFTModel
-                (input->getId(),
+                (inputId,
                  channelCount == 1 ? m_input.getChannel() : ch,
                  primaryTransform.getWindowType(),
                  blockSize,
                  stepSize,
                  blockSize);