Fix #45 (rename opcPopulater to opcPopulator)

app/tools/CMakeLists.txt

@@ -6,7 +6,7 @@ if(ICUB_USE_IPOPT)
    add_subdirectory(referenceFrameHandler)
 endif()
 
-add_subdirectory(opcPopulater)
+add_subdirectory(opcPopulator)
 add_subdirectory(actionRecogDataDumper)
 add_subdirectory(touchDetector)
 

app/tools/opcPopulater/CMakeLists.txt → app/tools/opcPopulator/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Authors: Grégoire Pointeau
 # CopyPolicy: Released under the terms of the GNU GPL v2.0.
 
-set(appname opcPopulater)
+set(appname opcPopulator)
 file(GLOB ini      ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.*)
 file(GLOB template ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.template)
 

src/modules/tools/CMakeLists.txt

@@ -7,7 +7,7 @@ if(ICUB_USE_IPOPT)
 endif()
 
 add_subdirectory(guiUpdater)
-add_subdirectory(opcPopulater)
+add_subdirectory(opcPopulator)
 add_subdirectory(actionRecogDataDumper)
 add_subdirectory(touchDetector)
 

src/modules/tools/opcPopulater/CMakeLists.txt → src/modules/tools/opcPopulator/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Authors: Grégoire Pointeau
 # CopyPolicy: Released under the terms of the GNU GPL v2.0.
 
-project(opcPopulater)
+project(opcPopulator)
 
 file(GLOB folder_source src/*.cpp src/*.cc src/*.c)
 file(GLOB folder_header include/*.h  )

src/modules/tools/opcPopulater/include/opcPopulater.h → src/modules/tools/opcPopulator/include/opcPopulator.h

@@ -8,9 +8,9 @@ namespace icubclient {
 }
 
 /**
- * \ingroup opcPopulater
+ * \ingroup opcPopulator
  */
-class opcPopulater : public yarp::os::RFModule {
+class opcPopulator : public yarp::os::RFModule {
 protected:
 
     icubclient::ICubClient *iCub;

src/modules/tools/opcPopulater/opcPopulater.xml → src/modules/tools/opcPopulator/opcPopulator.xml

@@ -3,9 +3,9 @@
 
 <module>
 
-   <name>opcPopulater</name>
+   <name>opcPopulator</name>
    <doxygen-group>icubclient_modules</doxygen-group>
-   <description>The %opcPopulater can be used to spawn new entities in simulation and control their parameters. This allows testing new functionalities in a controlled environment, without the noise encountered when using the real robot.</description>
+   <description>The %opcPopulator can be used to spawn new entities in simulation and control their parameters. This allows testing new functionalities in a controlled environment, without the noise encountered when using the real robot.</description>
    <copypolicy>Released under the terms of the GNU GPL v2.0</copypolicy>
    <version>1.0</version>
 

src/modules/tools/opcPopulater/src/main.cpp → src/modules/tools/opcPopulator/src/main.cpp

@@ -17,7 +17,7 @@
 
 
 
-#include "opcPopulater.h"
+#include "opcPopulator.h"
 
 using namespace std;
 using namespace yarp::os;
@@ -30,11 +30,11 @@ int main(int argc, char * argv[])
         yError()<<"YARP network seems unavailable!";
         return 1;
     }
-    opcPopulater mod;
+    opcPopulator mod;
     ResourceFinder rf;
     rf.setVerbose(true);
-    rf.setDefaultContext("opcPopulater");
-    rf.setDefaultConfigFile("opcPopulater.ini");
+    rf.setDefaultContext("opcPopulator");
+    rf.setDefaultConfigFile("opcPopulator.ini");
     rf.configure(argc, argv);
     return mod.runModule(rf);
 }

src/modules/tools/opcPopulater/src/opcPopulater.cpp → src/modules/tools/opcPopulator/src/opcPopulator.cpp

@@ -1,23 +1,23 @@
 #include <functional>
-#include "opcPopulater.h"
+#include "opcPopulator.h"
 #include "icubclient/clients/icubClient.h"
 #include "icubclient/subsystems/subSystem_ARE.h"
 
 using namespace std;
 using namespace yarp::os;
 using namespace icubclient;
 
-bool opcPopulater::configure(yarp::os::ResourceFinder &rf)
+bool opcPopulator::configure(yarp::os::ResourceFinder &rf)
 {
-    string moduleName = rf.check("name", Value("opcPopulater")).asString().c_str();
+    string moduleName = rf.check("name", Value("opcPopulator")).asString().c_str();
     setName(moduleName.c_str());
 
     yInfo() << moduleName << " : finding configuration files...";
     period = rf.check("period", Value(0.1)).asDouble();
 
     //Create an iCub Client and check that all dependencies are here before starting
     bool isRFVerbose = false;
-    iCub = new ICubClient(moduleName, "opcPopulater", "client.ini", isRFVerbose);
+    iCub = new ICubClient(moduleName, "opcPopulator", "client.ini", isRFVerbose);
     iCub->opc->isVerbose = false;
     if (!iCub->connect())
     {
@@ -54,15 +54,15 @@ bool opcPopulater::configure(yarp::os::ResourceFinder &rf)
 }
 
 
-bool opcPopulater::close() {
+bool opcPopulator::close() {
     iCub->close();
     delete iCub;
 
     return true;
 }
 
 
-bool opcPopulater::respond(const Bottle& command, Bottle& reply) {
+bool opcPopulator::respond(const Bottle& command, Bottle& reply) {
     string helpMessage = string(getName().c_str()) +
         " commands are: \n" +
         "help \n" +
@@ -126,15 +126,15 @@ bool opcPopulater::respond(const Bottle& command, Bottle& reply) {
 }
 
 /* Called periodically every getPeriod() seconds */
-bool opcPopulater::updateModule() {
+bool opcPopulator::updateModule() {
     return true;
 }
 
-bool opcPopulater::populateEntityRandom(const Bottle& bInput){
+bool opcPopulator::populateEntityRandom(const Bottle& bInput){
 
     if (bInput.size() != 3)
     {
-        yWarning() << " in opcPopulater::populateEntityRandom | wrong number of input";
+        yWarning() << " in opcPopulator::populateEntityRandom | wrong number of input";
         return false;
     }
     string sName = bInput.get(2).toString();
@@ -175,11 +175,11 @@ bool opcPopulater::populateEntityRandom(const Bottle& bInput){
 }
 
 
-bool opcPopulater::addUnknownEntity(const Bottle &bInput){
+bool opcPopulator::addUnknownEntity(const Bottle &bInput){
 
     if (bInput.size() != 2)
     {
-        yWarning() << " in opcPopulater::addUnknownEntity | wrong number of input";
+        yWarning() << " in opcPopulator::addUnknownEntity | wrong number of input";
         return false;
     }
 
@@ -221,10 +221,10 @@ bool opcPopulater::addUnknownEntity(const Bottle &bInput){
     return true;
 }
 
-bool opcPopulater::setAttributeEntity(const Bottle& bInput, std::function<void(Object*, double)> f_setter){
+bool opcPopulator::setAttributeEntity(const Bottle& bInput, std::function<void(Object*, double)> f_setter){
 
     if (bInput.size() != 3) {
-        yWarning() << " in opcPopulater::setAttributeEntity| wrong number of input";
+        yWarning() << " in opcPopulator::setAttributeEntity| wrong number of input";
         return false;
     }
 
@@ -246,7 +246,7 @@ bool opcPopulater::setAttributeEntity(const Bottle& bInput, std::function<void(O
 }
 
 
-bool opcPopulater::populateSpecific() {
+bool opcPopulator::populateSpecific() {
     iCub->opc->clear();
 
     double errorMargin = noise;
@@ -295,7 +295,7 @@ bool opcPopulater::populateSpecific() {
 }
 
 
-bool opcPopulater::populateTwoUnknowns() {
+bool opcPopulator::populateTwoUnknowns() {
     iCub->opc->clear();
 
     Object* obj1 = iCub->opc->addOrRetrieveEntity<Object>("unknown_1");
@@ -322,7 +322,7 @@ bool opcPopulater::populateTwoUnknowns() {
 }
 
 
-bool opcPopulater::populateRedBall(){
+bool opcPopulator::populateRedBall(){
 
     Object* obj1 = iCub->opc->addOrRetrieveEntity<Object>("red_ball");
     obj1->m_ego_position[0] = -0.4;