rename oms_addResources to oms_newResources (#1082)

Author: arun3688

src/OMSimulatorLib/Component.h

@@ -91,7 +91,7 @@ namespace oms
     virtual oms_status_enu_t setReal(const ComRef& cref, double value) { return logError_NotImplemented; }
     virtual oms_status_enu_t setRealInputDerivative(const ComRef& cref, const SignalDerivative& der) { return logError_NotImplemented; }
     virtual oms_status_enu_t stepUntil(double stopTime) { return oms_status_ok; }
-    virtual oms_status_enu_t addResources(std::string& filename) { return oms_status_ok; }
+    virtual oms_status_enu_t newResources(std::string& filename) { return logError_NotImplemented; }
 
     const ComRef& getCref() const { return cref; }
     ComRef getFullCref() const;

src/OMSimulatorLib/ComponentFMUCS.cpp

@@ -684,7 +684,7 @@ oms::ComRef oms::ComponentFMUCS::getValidCref(ComRef cref)
   return tail;
 }
 
-oms_status_enu_t oms::ComponentFMUCS::addResources(std::string& filename)
+oms_status_enu_t oms::ComponentFMUCS::newResources(std::string& filename)
 {
   Values resources;
   if (!values.hasResources())

src/OMSimulatorLib/ComponentFMUCS.h

@@ -108,7 +108,7 @@ namespace oms
 
     void getFilteredSignals(std::vector<Connector>& filteredSignals) const;
 
-    oms_status_enu_t addResources(std::string& filename);
+    oms_status_enu_t newResources(std::string& filename);
     oms_status_enu_t setResourcesHelper1(Values value);
     oms_status_enu_t setResourcesHelper2(Values value);
 

src/OMSimulatorLib/ComponentFMUME.cpp

@@ -710,7 +710,7 @@ oms_status_enu_t oms::ComponentFMUME::doEventIteration()
   return oms_status_ok;
 }
 
-oms_status_enu_t oms::ComponentFMUME::addResources(std::string& filename)
+oms_status_enu_t oms::ComponentFMUME::newResources(std::string& filename)
 {
   Values resources;
   if (!values.hasResources())

src/OMSimulatorLib/ComponentFMUME.h

@@ -107,7 +107,7 @@ namespace oms
 
     void getFilteredSignals(std::vector<Connector>& filteredSignals) const;
 
-    oms_status_enu_t addResources(std::string& filename);
+    oms_status_enu_t newResources(std::string& filename);
     oms_status_enu_t setResourcesHelper1(Values value);
     oms_status_enu_t setResourcesHelper2(Values value);
 

src/OMSimulatorLib/Model.cpp

@@ -495,13 +495,13 @@ oms_status_enu_t oms::Model::updateParameterBindingsToSSD(pugi::xml_node& node,
   return oms_status_ok;
 }
 
-oms_status_enu_t oms::Model::addResources(const oms::ComRef& cref)
+oms_status_enu_t oms::Model::newResources(const oms::ComRef& cref)
 {
   ComRef subCref(cref);
   std::string fileName = "resources/" + subCref.pop_suffix();
 
   if (system)
-    return system->addResources(subCref, fileName);
+    return system->newResources(subCref, fileName);
 
   return oms_status_ok;
 }

src/OMSimulatorLib/Model.h

@@ -73,7 +73,7 @@ namespace oms
     oms_status_enu_t rename(const ComRef& cref, const ComRef& newCref);
     oms_status_enu_t list(const ComRef& cref, char** contents);
     oms_status_enu_t addSystem(const ComRef& cref, oms_system_enu_t type);
-    oms_status_enu_t addResources(const ComRef& cref);
+    oms_status_enu_t newResources(const ComRef& cref);
 
     oms_status_enu_t exportToSSD(Snapshot& snapshot) const;
     oms_status_enu_t exportSnapshot(const ComRef& cref, char** contents);

src/OMSimulatorLib/OMSimulator.cpp

@@ -279,7 +279,7 @@ oms_status_enu_t oms_importSnapshot(const char* cref, const char* snapshot, char
   return oms::Scope::GetInstance().importSnapshot(oms::ComRef(cref), snapshot, newCref);
 }
 
-oms_status_enu_t oms_addResources(const char* cref_)
+oms_status_enu_t oms_newResources(const char* cref_)
 {
   oms::ComRef tail(cref_);
   oms::ComRef front = tail.pop_front();
@@ -291,7 +291,7 @@ oms_status_enu_t oms_addResources(const char* cref_)
   if (!model)
     return logError_ModelNotInScope(front);
 
-  return model->addResources(tail);
+  return model->newResources(tail);
 }
 
 oms_status_enu_t oms_addSystem(const char* cref_, oms_system_enu_t type)

src/OMSimulatorLib/OMSimulator.h

@@ -66,7 +66,6 @@ OMSAPI oms_status_enu_t OMSCALL oms_addConnectorToTLMBus(const char* busCref, co
 OMSAPI oms_status_enu_t OMSCALL oms_addDynamicValueIndicator(const char* signal, const char* lower, const char* upper, double stepSize);
 OMSAPI oms_status_enu_t OMSCALL oms_addEventIndicator(const char* signal);
 OMSAPI oms_status_enu_t OMSCALL oms_addExternalModel(const char* cref, const char* path, const char* startscript);
-OMSAPI oms_status_enu_t OMSCALL oms_addResources(const char* cref);
 OMSAPI oms_status_enu_t OMSCALL oms_addSignalsToResults(const char* cref, const char* regex);
 OMSAPI oms_status_enu_t OMSCALL oms_addStaticValueIndicator(const char* signal, double lower, double upper, double stepSize);
 OMSAPI oms_status_enu_t OMSCALL oms_addSubModel(const char* cref, const char* fmuPath);
@@ -123,6 +122,7 @@ OMSAPI oms_status_enu_t OMSCALL oms_list(const char* cref, char** contents);
 OMSAPI oms_status_enu_t OMSCALL oms_listUnconnectedConnectors(const char* cref, char** contents);
 OMSAPI oms_status_enu_t OMSCALL oms_loadSnapshot(const char* cref, const char* snapshot, char** newCref);
 OMSAPI oms_status_enu_t OMSCALL oms_newModel(const char* cref);
+OMSAPI oms_status_enu_t OMSCALL oms_newResources(const char* cref);
 OMSAPI oms_status_enu_t OMSCALL oms_removeSignalsFromResults(const char* cref, const char* regex);
 OMSAPI oms_status_enu_t OMSCALL oms_rename(const char* cref, const char* newCref);
 OMSAPI oms_status_enu_t OMSCALL oms_reset(const char* cref);

src/OMSimulatorLib/System.cpp

@@ -325,7 +325,7 @@ oms_status_enu_t oms::System::addSubModel(const oms::ComRef& cref, const std::st
   return system->addSubModel(tail, path);
 }
 
-oms_status_enu_t oms::System::addResources(const ComRef& cref, std::string& filename)
+oms_status_enu_t oms::System::newResources(const ComRef& cref, std::string& filename)
 {
   ComRef tail(cref);
   ComRef front = tail.pop_front();
@@ -349,15 +349,15 @@ oms_status_enu_t oms::System::addResources(const ComRef& cref, std::string& file
 
   auto subsystem = subsystems.find(tail);
   if (subsystem != subsystems.end())
-    return subsystem->second->addResources(tail, filename);
+    return subsystem->second->newResources(tail, filename);
 
   auto component = components.find(tail);
   if (component != components.end())
-    return component->second->addResources(filename);
+    return component->second->newResources(filename);
 
   /*check for adding resources to components in subsystems
     e.g root.system1.add
-    oms_addResources("root.system1.add:add.ssv")
+    oms_newResources("root.system1.add:add.ssv")
   */
   ComRef tailA(tail);
   ComRef frontA = tailA.pop_front();
@@ -368,7 +368,7 @@ oms_status_enu_t oms::System::addResources(const ComRef& cref, std::string& file
 
   auto componentA = system->components.find(tailA);
   if (componentA != components.end())
-    return componentA->second->addResources(filename);
+    return componentA->second->newResources(filename);
 
   return logError("failed for \"" + std::string(getFullCref() + cref) + "\""  + " as the identifier could not be resolved to a system or subsystem or component");
 }