From 4c047fb432dd541971b828841b343ad60cf131ab Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Mon, 28 Jun 2010 17:59:50 +0900
Subject: [PATCH] Corrected typo in gain-adaptative and related names.
---
include/sot-core/gain-adaptive.h | 10 ++---
src/CMakeLists.txt | 2 +-
...{gain-adaptative.cpp => gain-adaptive.cpp} | 40 +++++++++----------
unitTesting/CMakeLists.txt | 2 +-
unitTesting/factory/test_factory.cpp | 2 +-
unitTesting/sot/tsot.cpp | 2 +-
6 files changed, 29 insertions(+), 29 deletions(-)
rename src/task/{gain-adaptative.cpp => gain-adaptive.cpp} (83%)
diff --git a/include/sot-core/gain-adaptive.h b/include/sot-core/gain-adaptive.h
index 5237c942..50e27df5 100644
--- a/include/sot-core/gain-adaptive.h
+++ b/include/sot-core/gain-adaptive.h
@@ -39,7 +39,7 @@ namespace ml = maal::boost;
/* --------------------------------------------------------------------- */
#if defined (WIN32)
-# if defined (sotGainAdaptative_EXPORTS)
+# if defined (sotGainAdaptive_EXPORTS)
# define SOTGAINADAPTATIVE_EXPORT __declspec(dllexport)
# else
# define SOTGAINADAPTATIVE_EXPORT __declspec(dllimport)
@@ -55,7 +55,7 @@ namespace ml = maal::boost;
namespace sot {
namespace dg = dynamicgraph;
-class SOTGAINADAPTATIVE_EXPORT GainAdaptative
+class SOTGAINADAPTATIVE_EXPORT GainAdaptive
: public dg::Entity
{
@@ -82,9 +82,9 @@ class SOTGAINADAPTATIVE_EXPORT GainAdaptative
public: /* --- CONSTRUCTORS ---- */
- GainAdaptative( const std::string & name );
- GainAdaptative( const std::string & name,const double& lambda );
- GainAdaptative( const std::string & name,
+ GainAdaptive( const std::string & name );
+ GainAdaptive( const std::string & name,const double& lambda );
+ GainAdaptive( const std::string & name,
const double& valueAt0,
const double& valueAtInfty,
const double& tanAt0 );
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87acce63..3101c604 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(plugins
matrix/vector-constant
matrix/vector-to-rotation
- task/gain-adaptative
+ task/gain-adaptive
task/task-pd
task/constraint
task/gain-hyperbolic
diff --git a/src/task/gain-adaptative.cpp b/src/task/gain-adaptive.cpp
similarity index 83%
rename from src/task/gain-adaptative.cpp
rename to src/task/gain-adaptive.cpp
index 33730c38..cd02a541 100644
--- a/src/task/gain-adaptative.cpp
+++ b/src/task/gain-adaptive.cpp
@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
- * File: GainAdaptative.cpp
+ * File: GainAdaptive.cpp
* Project: SOT
* Author: Nicolas Mansard
*
@@ -32,13 +32,13 @@
using namespace sot;
using namespace dynamicgraph;
-SOT_FACTORY_ENTITY_PLUGIN(GainAdaptative,"GainAdaptative");
+SOT_FACTORY_ENTITY_PLUGIN(GainAdaptive,"GainAdaptive");
-const double GainAdaptative::
+const double GainAdaptive::
ZERO_DEFAULT = .1;
-const double GainAdaptative::
+const double GainAdaptive::
INFTY_DEFAULT = .1;
-const double GainAdaptative::
+const double GainAdaptive::
TAN_DEFAULT = 1;
/* --------------------------------------------------------------------- */
@@ -51,14 +51,14 @@ Entity(name) \
,coeff_a(0) \
,coeff_b(0) \
,coeff_c(0) \
-,errorSIN(NULL,"sotGainAdaptative("+name+")::input(vector)::error") \
-,gainSOUT( boost::bind(&GainAdaptative::computeGain,this,_1,_2), \
- errorSIN,"sotGainAdaptative("+name+")::output(double)::gain" )
+,errorSIN(NULL,"sotGainAdaptive("+name+")::input(vector)::error") \
+,gainSOUT( boost::bind(&GainAdaptive::computeGain,this,_1,_2), \
+ errorSIN,"sotGainAdaptive("+name+")::output(double)::gain" )
-GainAdaptative::
-GainAdaptative( const std::string & name )
+GainAdaptive::
+GainAdaptive( const std::string & name )
:__SOT_GAIN_ADAPTATIVE_INIT
{
sotDEBUG(15) << "New gain <"<<name<<">"<<std::endl;
@@ -67,16 +67,16 @@ GainAdaptative( const std::string & name )
}
-GainAdaptative::
-GainAdaptative( const std::string & name,const double& lambda )
+GainAdaptive::
+GainAdaptive( const std::string & name,const double& lambda )
:__SOT_GAIN_ADAPTATIVE_INIT
{
init(lambda);
Entity::signalRegistration( gainSOUT );
}
-GainAdaptative::
-GainAdaptative( const std::string & name,
+GainAdaptive::
+GainAdaptive( const std::string & name,
const double& valueAt0,
const double& valueAtInfty,
const double& tanAt0 )
@@ -87,7 +87,7 @@ GainAdaptative( const std::string & name,
}
-void GainAdaptative::
+void GainAdaptive::
init( const double& valueAt0,
const double& valueAtInfty,
const double& tanAt0 )
@@ -100,7 +100,7 @@ init( const double& valueAt0,
return;
}
-void GainAdaptative::
+void GainAdaptive::
forceConstant( void )
{
coeff_a = 0;
@@ -110,7 +110,7 @@ forceConstant( void )
/* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
-void GainAdaptative::
+void GainAdaptive::
display( std::ostream& os ) const
{
os << "Gain Adaptative "<<getName();
@@ -119,7 +119,7 @@ display( std::ostream& os ) const
}
#include <sot-core/exception-task.h>
-void GainAdaptative::
+void GainAdaptive::
commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os )
@@ -140,7 +140,7 @@ commandLine( const std::string& cmdLine,
else if( cmdLine == "forceConstant") forceConstant();
else if( cmdLine == "help" )
{
- os << "GainAdaptative: \n"
+ os << "GainAdaptive: \n"
<< "\t- set gain_0=%f gain_inf=%f tan_0=%f\t<Set the gain parameters>\n"
<< "\t- setConstant gain=%f\t\t\t<Set the adaptative gain to a constant value>\n"
<< "\t- forceConstant\t\t\t\t<Set the gain to a constant value equals to gain_inf>"
@@ -154,7 +154,7 @@ commandLine( const std::string& cmdLine,
/* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
-double& GainAdaptative::
+double& GainAdaptive::
computeGain( double&res, int t )
{
sotDEBUGIN(15);
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index b789b96c..41cc0cff 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -10,7 +10,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test-paths.h.cmake
SET(TEST_tsot_LIBS
task
feature-visual-point
- gain-adaptative
+ gain-adaptive
)
#test paths and names (without .cpp extension)
diff --git a/unitTesting/factory/test_factory.cpp b/unitTesting/factory/test_factory.cpp
index 33005010..6715b292 100644
--- a/unitTesting/factory/test_factory.cpp
+++ b/unitTesting/factory/test_factory.cpp
@@ -135,7 +135,7 @@ if( NULL==dlib )
exit(1);
}
- Entity* gain = g_factory.newEntity("GainAdaptative","Gain");
+ Entity* gain = g_factory.newEntity("GainAdaptive","Gain");
FeatureAbstract* point = sotFactory.newFeature("FeatureVisualPoint","DynamicTest.");
try {
diff --git a/unitTesting/sot/tsot.cpp b/unitTesting/sot/tsot.cpp
index 901e7914..32521d61 100644
--- a/unitTesting/sot/tsot.cpp
+++ b/unitTesting/sot/tsot.cpp
@@ -71,7 +71,7 @@ int main( void )
task->addFeature(*p1);
task->addFeature(*p1);
- GainAdaptative * lambda = new GainAdaptative("g");
+ GainAdaptive * lambda = new GainAdaptive("g");
lambda->errorSIN.plug( &task->errorSOUT );
task->controlGainSIN.plug( &lambda->gainSOUT );
--
GitLab