Skip to content
Snippets Groups Projects
Unverified Commit c4158e5c authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #11 from nim65s/topic/delete-shell

delete shell
parents 117917e9 b726da66
No related branches found
No related tags found
No related merge requests found
Pipeline #1211 passed
...@@ -26,6 +26,7 @@ SET(PROJECT_DESCRIPTION "control by inverse dynamics.") ...@@ -26,6 +26,7 @@ SET(PROJECT_DESCRIPTION "control by inverse dynamics.")
SET(PROJECT_URL "http://github.com/laas/sot-dyninv") SET(PROJECT_URL "http://github.com/laas/sot-dyninv")
SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}") SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}")
SET(DOXYGEN_USE_MATHJAX YES)
# Disable -Werror on Unix for now. # Disable -Werror on Unix for now.
SET(CXX_DISABLE_WERROR True) SET(CXX_DISABLE_WERROR True)
......
...@@ -3,7 +3,7 @@ sot-dyninv ...@@ -3,7 +3,7 @@ sot-dyninv
[![Building Status](https://travis-ci.org/stack-of-tasks/sot-dyninv.svg?branch=master)](https://travis-ci.org/stack-of-tasks/sot-dyninv) [![Building Status](https://travis-ci.org/stack-of-tasks/sot-dyninv.svg?branch=master)](https://travis-ci.org/stack-of-tasks/sot-dyninv)
[![Pipeline status](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/badges/master/pipeline.svg)](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/commits/master) [![Pipeline status](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/badges/master/pipeline.svg)](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/commits/master)
[![Coverage report](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/sot-dyninv/master/coverage/) [![Coverage report](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/gepetto/doc/stack-of-tasks/sot-dyninv/master/coverage/)
This sofware provides the solver and features to resolve the inverse of the This sofware provides the solver and features to resolve the inverse of the
......
...@@ -244,52 +244,6 @@ namespace dynamicgraph ...@@ -244,52 +244,6 @@ namespace dynamicgraph
} }
catch (ExceptionSignal e) {} catch (ExceptionSignal e) {}
} }
void ControllerPD::
commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os )
{
if( cmdLine == "help" )
{
os << "sotControlPD:\n"
<< " - size <arg>\t\tset the size of the vector.\n"
<< " - stdGain \t\tset the input vector gains according to the size for HRP2.\n"
<< " - velocityonly <arg>\t\tset Kp = 0.\n"
<< std::endl;
}
else if( cmdLine == "size" )
{
cmdArgs >> std::ws;
if( cmdArgs.good() )
{
unsigned int i; cmdArgs >> i ;
size(i);
}
else
{
os << "size = " << size() << std::endl;
}
}
else if( cmdLine == "velocityonly" )
{ setGainVelocityOnly(); }
else if( cmdLine == "stdGain" )
{
std::string config = "high";
cmdArgs >> std::ws; if( cmdArgs.good() ) cmdArgs >> config;
setStandardGains( config );
}
else
{
Entity::commandLine(cmdLine,cmdArgs,os);
}
}
} // namespace dyninv } // namespace dyninv
} // namespace sot } // namespace sot
} // namespace dynamicgraph } // namespace dynamicgraph
......
...@@ -74,10 +74,6 @@ namespace dynamicgraph { ...@@ -74,10 +74,6 @@ namespace dynamicgraph {
virtual void display( std::ostream& os ) const; virtual void display( std::ostream& os ) const;
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os );
public: /* --- SIGNALS --- */ public: /* --- SIGNALS --- */
DECLARE_SIGNAL_IN(Kp,dg::Vector); DECLARE_SIGNAL_IN(Kp,dg::Vector);
......
...@@ -342,31 +342,6 @@ namespace dynamicgraph ...@@ -342,31 +342,6 @@ namespace dynamicgraph
{ {
os << "DynamicIntegrator "<<getName() << ". " << std::endl; os << "DynamicIntegrator "<<getName() << ". " << std::endl;
} }
void DynamicIntegrator::
commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os )
{
if( cmdLine == "help" )
{
os << "DynamicIntegrator:" << std::endl
<< " - inc [dt]" << std::endl;
}
else if( cmdLine == "inc" )
{
if( cmdArgs >> std::ws, cmdArgs.good() )
{
double dt; cmdArgs >> dt; dtSIN = dt;
}
integrateFromSignals();
}
else
{
Entity::commandLine( cmdLine,cmdArgs,os );
}
}
} // namespace dyninv } // namespace dyninv
} // namespace sot } // namespace sot
} // namespace dynamicgraph } // namespace dynamicgraph
......
...@@ -61,10 +61,6 @@ namespace dynamicgraph { ...@@ -61,10 +61,6 @@ namespace dynamicgraph {
virtual void display( std::ostream& os ) const; virtual void display( std::ostream& os ) const;
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os );
public: /* --- SIGNALS --- */ public: /* --- SIGNALS --- */
DECLARE_SIGNAL_IN( acceleration,dg::Vector ); DECLARE_SIGNAL_IN( acceleration,dg::Vector );
......
...@@ -218,55 +218,6 @@ namespace dynamicgraph ...@@ -218,55 +218,6 @@ namespace dynamicgraph
{ {
os << "PseudoRobotDynamic "<<getName() << ". " << std::endl; os << "PseudoRobotDynamic "<<getName() << ". " << std::endl;
} }
void PseudoRobotDynamic::
commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os )
{
sotDEBUGIN(15);
if( cmdLine == "help" )
{
os << "PseudoRobotDynamic:" << std::endl
<< " - replace <OpenHRP> [plug]" << std::endl;
}
else if( cmdLine == "replace" )
{
if( cmdArgs >> std::ws, cmdArgs.good() )
{
std::string repName; cmdArgs >> repName >> std::ws;
bool plug = cmdArgs.good();
replaceSimulatorEntity( repName,plug );
}
}
else if( cmdLine=="sbs" || cmdLine=="play" || cmdLine =="withForces"
|| cmdLine == "periodicCall" || cmdLine == "periodicCallBefore"
|| cmdLine == "periodicCallAfter" )
{
formerOpenHRP ->commandLine( cmdLine,cmdArgs,os );
}
else if( cmdLine=="root" )
{
if( cmdArgs >> std::ws, cmdArgs.good() )
{
dg::Matrix M; cmdArgs >> M ; setRoot(M);
std::ostringstream osback;
osback << M.data(); cmdArgs.str(osback.str());
formerOpenHRP ->commandLine( cmdLine,cmdArgs,os );
}
else
{
os << "TODO" << std::endl;
}
}
else
{
Entity::commandLine( cmdLine,cmdArgs,os );
}
sotDEBUGOUT(15);
}
} // namespace dyninv } // namespace dyninv
} // namespace sot } // namespace sot
} // namespace dynamicgraph } // namespace dynamicgraph
......
...@@ -71,10 +71,6 @@ namespace dynamicgraph { ...@@ -71,10 +71,6 @@ namespace dynamicgraph {
virtual void display( std::ostream& os ) const; virtual void display( std::ostream& os ) const;
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os );
typedef ::dynamicgraph::EntityHelper<PseudoRobotDynamic>::EntityClassName typedef ::dynamicgraph::EntityHelper<PseudoRobotDynamic>::EntityClassName
EntityClassName; EntityClassName;
......
...@@ -89,24 +89,6 @@ namespace dynamicgraph ...@@ -89,24 +89,6 @@ namespace dynamicgraph
{ {
os << "ZmpEstimator "<<getName() << "." << std::endl; os << "ZmpEstimator "<<getName() << "." << std::endl;
} }
void ZmpEstimator::
commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os )
{
if( cmdLine == "help" )
{
os << "ZmpEstimator:\n"
<< "\t- ." << std::endl;
Entity::commandLine( cmdLine,cmdArgs,os );
}
else
{
Entity::commandLine( cmdLine,cmdArgs,os );
}
}
} // namespace dyninv } // namespace dyninv
} // namespace sot } // namespace sot
} // namespace dynamicgraph } // namespace dynamicgraph
......
...@@ -60,10 +60,6 @@ namespace dynamicgraph { ...@@ -60,10 +60,6 @@ namespace dynamicgraph {
virtual void display( std::ostream& os ) const; virtual void display( std::ostream& os ) const;
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
std::ostream& os );
public: /* --- SIGNALS --- */ public: /* --- SIGNALS --- */
DECLARE_SIGNAL_IN(fn,dg::Vector); DECLARE_SIGNAL_IN(fn,dg::Vector);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment