From 66516bf82cc0243325bf2cf2d5e5b9829cdf9af0 Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Wed, 9 Jun 2010 16:36:40 +0900
Subject: [PATCH] Added documentation, renamed header paths, corrected
CMakeLists accordingly.
(dynamicGraph/ -> dynamic-graph/)
---
doc/CMakeLists.txt | 6 ++--
doc/additionalDoc/package.h | 53 +++++++++++++++++++---------
doc/cmake_install.cmake | 6 ++--
doc/package.dox | 18 +++++-----
doc/package.dox.cmake | 8 ++---
src/CMakeLists.txt | 22 ++++++------
src/debug/contiifstream.cpp | 4 +--
src/debug/contiifstream.h | 2 +-
src/debug/debug.cpp | 2 +-
src/debug/debug.h | 2 +-
src/dgraph/entity.cpp | 8 ++---
src/dgraph/entity.h | 8 ++---
src/dgraph/factory.cpp | 4 +--
src/dgraph/factory.h | 4 +--
src/dgraph/interpreter.cpp | 12 +++----
src/dgraph/interpreter.h | 8 ++---
src/dgraph/plugin-loader.cpp | 4 +--
src/dgraph/plugin-loader.h | 4 +--
src/dgraph/pool.cpp | 10 +++---
src/dgraph/pool.h | 6 ++--
src/dgraph/shell-functions.cpp | 14 ++++----
src/dgraph/shell-functions.h | 4 +--
src/dgraph/shell-procedure.cpp | 32 ++++++++---------
src/dgraph/shell-procedure.h | 14 ++++----
src/exception/exception-abstract.cpp | 4 +--
src/exception/exception-abstract.h | 2 +-
src/exception/exception-factory.cpp | 4 +--
src/exception/exception-factory.h | 4 +--
src/exception/exception-signal.cpp | 2 +-
src/exception/exception-signal.h | 4 +--
src/signal/signal-array.cpp | 2 +-
src/signal/signal-array.h | 4 +--
src/signal/signal-base.h | 2 +-
src/signal/signal-ptr.h | 6 ++--
src/signal/signal-ptr.t.cpp | 4 +--
src/signal/signal-time-dependant.h | 4 +--
src/signal/signal.h | 6 ++--
src/signal/signal.t.cpp | 4 +--
src/signal/time-dependency.h | 6 ++--
src/signal/time-dependency.t.cpp | 4 +--
40 files changed, 168 insertions(+), 149 deletions(-)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 2b6030a..b18cd31 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -21,12 +21,12 @@ ADD_CUSTOM_TARGET(documentation ALL
# html files
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME})
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/dynamic-graph)
# doxytag
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.doxytag
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}/html)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/dynamic-graph/html)
# pictures
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pictures
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}/html)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/dynamic-graph/html)
diff --git a/doc/additionalDoc/package.h b/doc/additionalDoc/package.h
index 496b953..8fc0fc6 100644
--- a/doc/additionalDoc/package.h
+++ b/doc/additionalDoc/package.h
@@ -3,19 +3,14 @@
\section intro_dynamicGraph Introduction
-This package implements ...
+This code implements the factory design pattern, making creation of entities
+available to packages depending on the dynamicGraph API.
-@defgroup factory Plugin management modules.
-@ingroup factory
-
-This code implements the factory design pattern, making creation of features,
-tasks and objects available.
-
-Objects, which are derived from Entities, Tasks, or Features, can be
- declared within the code and compiled to shared librairies (.so/.dll files).
-These librairies can be loaded at run-time using the sotPluginLoader methods,
+Objects, which are derived from Entities, can be
+ declared within the code and compiled to shared libraries (.so/.dll files).
+These libraries can be loaded at run-time using the PluginLoader methods,
and at the same time register their class names to the Factory (see the
-sotFactory documentation to learn how).
+examples in the SOT documentation to learn how).
The Factory can then create instances of these objects and subsequently
register them in the Pool, where they can be listed, accessed, and acted upon
@@ -23,10 +18,14 @@ register them in the Pool, where they can be listed, accessed, and acted upon
signal connection graph file generation, help and name print, and signals.
Finally, a shell (command-line) interface is made available thanks to the
-sotInterpretor class (see the file test_shell.cpp). Objects deriving from
+Interpreter class (see the file test_shell.cpp for an example). Objects deriving from
Entity can expose their own commands by overriding the Entity's default
commandLine() method. It is possible to load a plugin to register custom
-shell commands; see sotShellFunctions and sotShellProcedure for an example.
+shell commands; see shell-functions and shell-procedure for an example.
+
+Some basic shell functions, and support for procedures, are also included.
+For a complete list of those, load the plugin shell-functions.so and type 'help'
+at the command line.
The public static objects (singletons) made available by including the
corresponding headers in this module are:
@@ -34,12 +33,32 @@ corresponding headers in this module are:
\li pool: PoolStorage
\li Shell: Interpreter
-\image html schema_plugin.png
+\image html pictures/use-case.svg
+
+.
+\defgroup dgraph Core classes and objects
+\defgroup signals Signals
+\ingroup dgraph
+@{
-@defgroup signals Signals
-@ingroup softwaresupport
+Classes that make up the core of the dynamicGraph library are listed here.
+@}
+\ingroup signals
+@{
This part provides the mechanism to transfer information
-from one feature to another.
+from one feature to another. There are three main types of signals,
+all deriving from the common class dynamicgraph::SignalBase :
+\li dynamicgraph::Signal
+\li dynamicgraph::SignalPtr
+\li dynamicgraph::SignalTimeDependant
+
+Signals can be grouped together using dynamicgraph::SignalArray.
+
+Signals implement a caching mechanism by storing the last computation time tick.
+Signals can be plug into one another or set through shell commands.
+@}
+
+\namespace dynamicgraph This is the namespace where every object and class of this library is located.
*/
diff --git a/doc/cmake_install.cmake b/doc/cmake_install.cmake
index c0978da..1f32064 100644
--- a/doc/cmake_install.cmake
+++ b/doc/cmake_install.cmake
@@ -33,14 +33,14 @@ IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
- FILE(INSTALL DESTINATION "/home/blue/sot-lib/share/doc/dynamicGraph" TYPE DIRECTORY FILES "/home/blue/sot-devel/dynamicGraph/doc/html")
+ FILE(INSTALL DESTINATION "/home/blue/sot-lib/share/doc/dynamic-graph" TYPE DIRECTORY FILES "/home/blue/sot-devel/dynamicGraph/doc/html")
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
- FILE(INSTALL DESTINATION "/home/blue/sot-lib/share/doc/dynamicGraph/html" TYPE FILE FILES "/home/blue/sot-devel/dynamicGraph/doc/dynamicGraph.doxytag")
+ FILE(INSTALL DESTINATION "/home/blue/sot-lib/share/doc/dynamic-graph/html" TYPE FILE FILES "/home/blue/sot-devel/dynamicGraph/doc/dynamicGraph.doxytag")
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
- FILE(INSTALL DESTINATION "/home/blue/sot-lib/share/doc/dynamicGraph/html" TYPE DIRECTORY FILES "/home/blue/sot-devel/dynamicGraph/doc/pictures")
+ FILE(INSTALL DESTINATION "/home/blue/sot-lib/share/doc/dynamic-graph/html" TYPE DIRECTORY FILES "/home/blue/sot-devel/dynamicGraph/doc/pictures")
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
diff --git a/doc/package.dox b/doc/package.dox
index e7ffe15..8a2be68 100644
--- a/doc/package.dox
+++ b/doc/package.dox
@@ -93,7 +93,7 @@ CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
-TOC_EXPAND = YES
+TOC_EXPAND = NO
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 1
GENERATE_TREEVIEW = YES
@@ -158,10 +158,10 @@ SKIP_FUNCTION_MACROS = YES
# Configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES = \
- /home/blue/sot-lib/share/doc/MatrixAbstractLayer/html/MatrixAbstractLayer.doxytag=/home/blue/sot-lib/share/doc/MatrixAbstractLayer/html \
- /home/blue/sot-lib/share/doc/dynamicsJRLJapan/html/dynamicsJRLJapan.doxytag=/home/blue/sot-lib/share/doc/dynamicsJRLJapan/html \
- /home/blue/sot-lib/share/doc/hrp2Dynamics/html/hrp2Dynamics.doxytag=/home/blue/sot-lib/share/doc/hrp2Dynamics/html \
- /home/blue/sot-lib/share/doc/walkGenJrl/html/walkGenJrl.doxytag=/home/blue/sot-lib/share/doc/walkGenJrl/html
+ /html/MatrixAbstractLayer.doxytag=/html \
+ /html/dynamicsJRLJapan.doxytag=/html \
+ /html/hrp2Dynamics.doxytag=/html \
+ /html/walkGenJrl.doxytag=/html
GENERATE_TAGFILE = dynamicGraph.doxytag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
@@ -172,7 +172,7 @@ PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
-SEARCHENGINE = NO
+SEARCHENGINE = YES
@@ -180,8 +180,8 @@ SEARCHENGINE = NO
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = "dynamicGraph library documentation"
-PROJECT_NUMBER = 1.0
+PROJECT_NAME = "dynamicGraph library"
+PROJECT_NUMBER = 1.0.0
#---------------------------------------------------------------------------
# Build related configuration options
@@ -210,7 +210,7 @@ SHOW_DIRECTORIES = NO
#---------------------------------------------------------------------------
FILE_PATTERNS = *.h *.idl
EXCLUDE_PATTERNS =
-INPUT = /home/blue/sot-devel/dynamicGraph/include \
+INPUT = /home/blue/sot-devel/dynamicGraph/src \
/home/blue/sot-devel/dynamicGraph/doc/additionalDoc
#---------------------------------------------------------------------------
diff --git a/doc/package.dox.cmake b/doc/package.dox.cmake
index ecfb55b..a0c54eb 100644
--- a/doc/package.dox.cmake
+++ b/doc/package.dox.cmake
@@ -93,7 +93,7 @@ CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
-TOC_EXPAND = YES
+TOC_EXPAND = NO
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 1
GENERATE_TREEVIEW = YES
@@ -172,7 +172,7 @@ PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
-SEARCHENGINE = NO
+SEARCHENGINE = YES
@@ -180,7 +180,7 @@ SEARCHENGINE = NO
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = "${PROJECT_NAME} library documentation"
+PROJECT_NAME = "${PROJECT_NAME} library"
PROJECT_NUMBER = ${PROJECT_VERSION}
#---------------------------------------------------------------------------
@@ -210,7 +210,7 @@ SHOW_DIRECTORIES = NO
#---------------------------------------------------------------------------
FILE_PATTERNS = *.h *.idl
EXCLUDE_PATTERNS =
-INPUT = ${${PROJECT_NAME}_SOURCE_DIR}/include \
+INPUT = ${${PROJECT_NAME}_SOURCE_DIR}/src \
${CMAKE_CURRENT_SOURCE_DIR}/additionalDoc
#---------------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3c3a38f..db3e05f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -88,17 +88,17 @@ SET(ADDED_SRC_DEPEND_PROPERTIES "")
FOREACH (header ${libdg_headers} ${libdg_templates})
GET_FILENAME_COMPONENT(headerName ${header} NAME)
ADD_CUSTOM_COMMAND(
- OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${headerName}
+ OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${header}
- ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${headerName}
+ ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${header}
)
INSTALL(FILES
- ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${headerName}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamicGraph
+ ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
SET(HEADER_IN_INCLUDE_DIR ${HEADER_IN_INCLUDE_DIR}
- ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${headerName})
+ ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName})
ENDFOREACH(header)
# --- Create a top level rule to copy all the headers from src to include/dynamicGraph
@@ -218,19 +218,19 @@ FOREACH (plugin ${libdg_plugins_headers})
# Add a command to copy the header.
ADD_CUSTOM_COMMAND(
- OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginHeader}
+ OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/${plugin}
- ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginHeader}
+ ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
- INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginHeader}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamicGraph
+ INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
# Create a top level rule to copy all the headers from src to include/dg
ADD_CUSTOM_TARGET(header_${newsofile} ALL
- DEPENDS ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginHeader})
+ DEPENDS ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader})
ENDFOREACH(plugin)
# --- PLUGIN TEMPLATEs -----------------------------------------
@@ -252,7 +252,7 @@ FOREACH (plugin ${libdg_plugins_templates})
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamicGraph
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
# Create a top level rule to copy all the headers from src to include/dg
diff --git a/src/debug/contiifstream.cpp b/src/debug/contiifstream.cpp
index c80d191..8118db0 100644
--- a/src/debug/contiifstream.cpp
+++ b/src/debug/contiifstream.cpp
@@ -17,8 +17,8 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/contiifstream.h>
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/contiifstream.h>
+#include <dynamic-graph/debug.h>
sotContiifstream::
sotContiifstream( const std::string& n )
diff --git a/src/debug/contiifstream.h b/src/debug/contiifstream.h
index dd73b0c..b1bacb1 100644
--- a/src/debug/contiifstream.h
+++ b/src/debug/contiifstream.h
@@ -35,7 +35,7 @@
#endif
#include <list>
-#include <dynamicGraph/interpreter.h>
+#include <dynamic-graph/interpreter.h>
#ifndef WIN32
#include <pthread.h>
#endif
diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp
index a8bc457..0f9ad48 100644
--- a/src/debug/debug.cpp
+++ b/src/debug/debug.cpp
@@ -31,7 +31,7 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/debug.h>
#include <fstream>
#include <ios>
diff --git a/src/debug/debug.h b/src/debug/debug.h
index c44e3e7..bd68923 100644
--- a/src/debug/debug.h
+++ b/src/debug/debug.h
@@ -42,7 +42,7 @@
#include <fstream>
#include <sstream>
#include <stdarg.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamicGraph-API.h>
/* -------------------------------------------------------------------------- */
diff --git a/src/dgraph/entity.cpp b/src/dgraph/entity.cpp
index 603c01f..6503c5f 100644
--- a/src/dgraph/entity.cpp
+++ b/src/dgraph/entity.cpp
@@ -18,10 +18,10 @@
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
/*! Local framework includes */
-#include <dynamicGraph/entity.h>
-#include <dynamicGraph/pool.h>
-#include <dynamicGraph/pool.h>
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/entity.h>
+#include <dynamic-graph/pool.h>
+#include <dynamic-graph/pool.h>
+#include <dynamic-graph/debug.h>
/*! System includes */
#include <stdlib.h>
diff --git a/src/dgraph/entity.h b/src/dgraph/entity.h
index d1bbe22..6bd4150 100644
--- a/src/dgraph/entity.h
+++ b/src/dgraph/entity.h
@@ -27,10 +27,10 @@
/* --------------------------------------------------------------------- */
/* SOT */
-#include <dynamicGraph/signal-base.h>
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/signal-array.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/signal-base.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/signal-array.h>
+#include <dynamic-graph/dynamicGraph-API.h>
/* --- STD --- */
#include <string>
diff --git a/src/dgraph/factory.cpp b/src/dgraph/factory.cpp
index 444e9d0..758f166 100644
--- a/src/dgraph/factory.cpp
+++ b/src/dgraph/factory.cpp
@@ -23,8 +23,8 @@
/* --------------------------------------------------------------------- */
/* --- SOT --- */
-#include <dynamicGraph/debug.h>
-#include <dynamicGraph/factory.h>
+#include <dynamic-graph/debug.h>
+#include <dynamic-graph/factory.h>
using namespace std;
using namespace dynamicgraph;
diff --git a/src/dgraph/factory.h b/src/dgraph/factory.h
index b276d5f..ec2724b 100644
--- a/src/dgraph/factory.h
+++ b/src/dgraph/factory.h
@@ -31,8 +31,8 @@
#include <string>
/* --- SOT --- */
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/dynamicGraph-API.h>
namespace dynamicgraph {
diff --git a/src/dgraph/interpreter.cpp b/src/dgraph/interpreter.cpp
index 9757ca7..133e42f 100644
--- a/src/dgraph/interpreter.cpp
+++ b/src/dgraph/interpreter.cpp
@@ -23,9 +23,9 @@
/* --------------------------------------------------------------------- */
/* SOT */
-#include <dynamicGraph/interpreter.h>
-#include <dynamicGraph/plugin-loader.h>
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/interpreter.h>
+#include <dynamic-graph/plugin-loader.h>
+#include <dynamic-graph/debug.h>
/* --- STD --- */
using namespace std;
@@ -92,10 +92,10 @@ deregisterFunction( const std::string& funname )
/* --------------------------------------------------------------------- */
/* --- NEW ------------------------------------------------------------- */
/* --------------------------------------------------------------------- */
-#include <dynamicGraph/factory.h>
+#include <dynamic-graph/factory.h>
using namespace std;
-#include <dynamicGraph/entity.h>
-#include <dynamicGraph/signal-base.h>
+#include <dynamic-graph/entity.h>
+#include <dynamic-graph/signal-base.h>
void Interpreter::
cmdPlug( const std::string& cmdLine, istringstream& cmdArg, std::ostream& os )
diff --git a/src/dgraph/interpreter.h b/src/dgraph/interpreter.h
index 645e0d0..5cbd968 100644
--- a/src/dgraph/interpreter.h
+++ b/src/dgraph/interpreter.h
@@ -27,10 +27,10 @@
/* --------------------------------------------------------------------- */
/* SOT */
-#include <dynamicGraph/signal-base.h>
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/pool.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/signal-base.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/pool.h>
+#include <dynamic-graph/dynamicGraph-API.h>
/* --- STD --- */
#include <string>
diff --git a/src/dgraph/plugin-loader.cpp b/src/dgraph/plugin-loader.cpp
index b83e3b5..c78f428 100644
--- a/src/dgraph/plugin-loader.cpp
+++ b/src/dgraph/plugin-loader.cpp
@@ -29,8 +29,8 @@
#endif
/* --- SOT --- */
-#include <dynamicGraph/plugin-loader.h>
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/plugin-loader.h>
+#include <dynamic-graph/debug.h>
/* --- STD --- */
#include <fstream>
diff --git a/src/dgraph/plugin-loader.h b/src/dgraph/plugin-loader.h
index 30c809f..1d670dd 100644
--- a/src/dgraph/plugin-loader.h
+++ b/src/dgraph/plugin-loader.h
@@ -32,8 +32,8 @@
#include <map>
/* --- SOT --- */
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/dynamicGraph-API.h>
namespace dynamicgraph {
diff --git a/src/dgraph/pool.cpp b/src/dgraph/pool.cpp
index 04fdc6b..38bd228 100644
--- a/src/dgraph/pool.cpp
+++ b/src/dgraph/pool.cpp
@@ -22,9 +22,9 @@
/* --------------------------------------------------------------------- */
/* --- SOT --- */
-#include <dynamicGraph/pool.h>
-#include <dynamicGraph/debug.h>
-#include <dynamicGraph/entity.h>
+#include <dynamic-graph/pool.h>
+#include <dynamic-graph/debug.h>
+#include <dynamic-graph/entity.h>
#include <list>
#include <typeinfo>
@@ -128,7 +128,7 @@ clearPlugin( const std::string& name )
/* --------------------------------------------------------------------- */
-#include <dynamicGraph/entity.h>
+#include <dynamic-graph/entity.h>
#ifdef WIN32
#include <time.h>
@@ -246,7 +246,7 @@ commandLine( const std::string& objectName,const std::string& functionName,
-#include <dynamicGraph/interpreter.h>
+#include <dynamic-graph/interpreter.h>
SignalBase<int>&
PoolStorage::
diff --git a/src/dgraph/pool.h b/src/dgraph/pool.h
index 589127e..82f5628 100644
--- a/src/dgraph/pool.h
+++ b/src/dgraph/pool.h
@@ -30,9 +30,9 @@
#include <sstream>
/* --- SOT --- */
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/signal-base.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/signal-base.h>
+#include <dynamic-graph/dynamicGraph-API.h>
namespace dynamicgraph
{
diff --git a/src/dgraph/shell-functions.cpp b/src/dgraph/shell-functions.cpp
index f75bb24..868db2c 100644
--- a/src/dgraph/shell-functions.cpp
+++ b/src/dgraph/shell-functions.cpp
@@ -17,13 +17,13 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/shell-functions.h>
-#include <dynamicGraph/plugin-loader.h>
-#include <dynamicGraph/factory.h>
-#include <dynamicGraph/debug.h>
-#include <dynamicGraph/entity.h>
-#include <dynamicGraph/signal.h>
-#include <dynamicGraph/exception-signal.h>
+#include <dynamic-graph/shell-functions.h>
+#include <dynamic-graph/plugin-loader.h>
+#include <dynamic-graph/factory.h>
+#include <dynamic-graph/debug.h>
+#include <dynamic-graph/entity.h>
+#include <dynamic-graph/signal.h>
+#include <dynamic-graph/exception-signal.h>
#ifdef WIN32
#include <Windows.h>
diff --git a/src/dgraph/shell-functions.h b/src/dgraph/shell-functions.h
index e5cf341..6bbd73a 100644
--- a/src/dgraph/shell-functions.h
+++ b/src/dgraph/shell-functions.h
@@ -27,8 +27,8 @@
/* --------------------------------------------------------------------- */
/* SOT */
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/interpreter.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/interpreter.h>
/* --- STD --- */
#include <string>
diff --git a/src/dgraph/shell-procedure.cpp b/src/dgraph/shell-procedure.cpp
index 771d372..42bb884 100644
--- a/src/dgraph/shell-procedure.cpp
+++ b/src/dgraph/shell-procedure.cpp
@@ -17,17 +17,17 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/shell-procedure.h>
-#include <dynamicGraph/plugin-loader.h>
-#include <dynamicGraph/factory.h>
-#include <dynamicGraph/debug.h>
-#include <dynamicGraph/entity.h>
+#include <dynamic-graph/shell-procedure.h>
+#include <dynamic-graph/plugin-loader.h>
+#include <dynamic-graph/factory.h>
+#include <dynamic-graph/debug.h>
+#include <dynamic-graph/entity.h>
#include <fstream>
using namespace std;
using namespace dynamicgraph;
-void sotShellProcedure::
+void ShellProcedure::
cmdStartProcedure( const std::string& cmdLine,std::istringstream& args,std::ostream& os )
{
if( cmdLine == "help" )
@@ -50,7 +50,7 @@ cmdStartProcedure( const std::string& cmdLine,std::istringstream& args,std::ostr
}
}
-void sotShellProcedure::
+void ShellProcedure::
cmdContinueProcedure( const std::string& cmdLine,std::istringstream& args,std::ostream& os )
{
if( cmdLine == "help" )
@@ -83,7 +83,7 @@ cmdContinueProcedure( const std::string& cmdLine,std::istringstream& args,std::o
currentProc.instructions.push_back( ins );
}
-void sotShellProcedure::
+void ShellProcedure::
cmdEndProcedure( const std::string& cmdLine,std::istringstream& args,std::ostream& os )
{
if( cmdLine == "help" )
@@ -110,12 +110,12 @@ cmdEndProcedure( const std::string& cmdLine,std::istringstream& args,std::ostrea
{ os<< "Redefining proc <"<<procName<<">: procedure already defined. "
<< "Overwrite it."<<endl; }
ShellFunctionRegisterer registration
- ( procName.c_str(),boost::bind(&sotShellProcedure::cmdProcedure,
+ ( procName.c_str(),boost::bind(&ShellProcedure::cmdProcedure,
this,procName,_1,_2,_3) );
}
-void sotShellProcedure::
+void ShellProcedure::
cmdProcedure( const std::string& procname,
const std::string& cmdLine,std::istringstream& args,std::ostream& os )
{
@@ -226,7 +226,7 @@ cmdProcedure( const std::string& procname,
}
}
-void sotShellProcedure::
+void ShellProcedure::
cmdFor( const std::string& cmdLine,std::istringstream& args,std::ostream& os )
{
if( cmdLine == "help" )
@@ -277,22 +277,22 @@ cmdFor( const std::string& cmdLine,std::istringstream& args,std::ostream& os )
}
}
-sotShellProcedure sotShellProceduror;
+ShellProcedure sotShellProceduror;
extern "C" {
ShellFunctionRegisterer regFun1
- ( "proc",boost::bind(&sotShellProcedure::cmdStartProcedure,
+ ( "proc",boost::bind(&ShellProcedure::cmdStartProcedure,
&sotShellProceduror,_1,_2,_3) );
ShellFunctionRegisterer regFun2
- ( "->",boost::bind(&sotShellProcedure::cmdContinueProcedure,
+ ( "->",boost::bind(&ShellProcedure::cmdContinueProcedure,
&sotShellProceduror,_1,_2,_3) );
ShellFunctionRegisterer regFun3
- ( "endproc",boost::bind(&sotShellProcedure::cmdEndProcedure,
+ ( "endproc",boost::bind(&ShellProcedure::cmdEndProcedure,
&sotShellProceduror,_1,_2,_3) );
ShellFunctionRegisterer regFun4
- ( "for",boost::bind(&sotShellProcedure::cmdFor,
+ ( "for",boost::bind(&ShellProcedure::cmdFor,
_1,_2,_3) );
}
diff --git a/src/dgraph/shell-procedure.h b/src/dgraph/shell-procedure.h
index fe7d3f0..6343c96 100644
--- a/src/dgraph/shell-procedure.h
+++ b/src/dgraph/shell-procedure.h
@@ -27,8 +27,8 @@
/* --------------------------------------------------------------------- */
/* SOT */
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/interpreter.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/interpreter.h>
/* --- STD --- */
#include <string>
@@ -46,13 +46,13 @@
/* --------------------------------------------------------------------- */
#if defined (WIN32)
-# if defined (sotShellProcedure_EXPORTS)
-# define SOTSHELLPROCEDURE_EXPORT __declspec(dllexport)
+# if defined (ShellProcedure_EXPORTS)
+# define ShellProcedure_EXPORT __declspec(dllexport)
# else
-# define SOTSHELLPROCEDURE_EXPORT __declspec(dllimport)
+# define ShellProcedure_EXPORT __declspec(dllimport)
# endif
#else
-# define SOTSHELLPROCEDURE_EXPORT
+# define ShellProcedure_EXPORT
#endif
/* --------------------------------------------------------------------- */
@@ -65,7 +65,7 @@
For more information, load the plugin and type help on a sot shell.
*/
-class SOTSHELLPROCEDURE_EXPORT sotShellProcedure
+class ShellProcedure_EXPORT ShellProcedure
{
public:
struct Instruction
diff --git a/src/exception/exception-abstract.cpp b/src/exception/exception-abstract.cpp
index 9aa1908..10739d6 100644
--- a/src/exception/exception-abstract.cpp
+++ b/src/exception/exception-abstract.cpp
@@ -19,8 +19,8 @@
-#include <dynamicGraph/exception-abstract.h>
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/exception-abstract.h>
+#include <dynamic-graph/debug.h>
using namespace std;
using namespace dynamicgraph;
diff --git a/src/exception/exception-abstract.h b/src/exception/exception-abstract.h
index 8465d4b..601f694 100644
--- a/src/exception/exception-abstract.h
+++ b/src/exception/exception-abstract.h
@@ -29,7 +29,7 @@
/* Classes standards. */
#include <iostream> /* Classe ostream. */
#include <string> /* Classe string. */
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamicGraph-API.h>
// Uncomment this macros to have lines parameter on the throw display
diff --git a/src/exception/exception-factory.cpp b/src/exception/exception-factory.cpp
index eaa49ca..c54eda0 100644
--- a/src/exception/exception-factory.cpp
+++ b/src/exception/exception-factory.cpp
@@ -17,8 +17,8 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/exception-factory.h>
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/exception-factory.h>
+#include <dynamic-graph/debug.h>
#include <stdarg.h>
#include <cstdio>
diff --git a/src/exception/exception-factory.h b/src/exception/exception-factory.h
index e00802b..db7cd37 100644
--- a/src/exception/exception-factory.h
+++ b/src/exception/exception-factory.h
@@ -26,8 +26,8 @@
/* --------------------------------------------------------------------- */
-#include <dynamicGraph/exception-abstract.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/exception-abstract.h>
+#include <dynamic-graph/dynamicGraph-API.h>
/* --------------------------------------------------------------------- */
/* --- CLASS ----------------------------------------------------------- */
diff --git a/src/exception/exception-signal.cpp b/src/exception/exception-signal.cpp
index 1a83e73..82ff222 100644
--- a/src/exception/exception-signal.cpp
+++ b/src/exception/exception-signal.cpp
@@ -17,7 +17,7 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/exception-signal.h>
+#include <dynamic-graph/exception-signal.h>
#include <stdarg.h>
#include <cstdio>
diff --git a/src/exception/exception-signal.h b/src/exception/exception-signal.h
index fd550ea..eab4f79 100644
--- a/src/exception/exception-signal.h
+++ b/src/exception/exception-signal.h
@@ -26,8 +26,8 @@
/* --------------------------------------------------------------------- */
-#include <dynamicGraph/exception-abstract.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/exception-abstract.h>
+#include <dynamic-graph/dynamicGraph-API.h>
/* --------------------------------------------------------------------- */
/* --- CLASS ----------------------------------------------------------- */
diff --git a/src/signal/signal-array.cpp b/src/signal/signal-array.cpp
index dbca3e4..bd7f5c5 100644
--- a/src/signal/signal-array.cpp
+++ b/src/signal/signal-array.cpp
@@ -17,7 +17,7 @@
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#include <dynamicGraph/signal-array.h>
+#include <dynamic-graph/signal-array.h>
namespace dynamicgraph {
SignalArray<int> sotNOSIGNAL(0);
diff --git a/src/signal/signal-array.h b/src/signal/signal-array.h
index 8150b52..4a860df 100644
--- a/src/signal/signal-array.h
+++ b/src/signal/signal-array.h
@@ -23,8 +23,8 @@
#ifndef __SIGNAL_ARRAY_HH
#define __SIGNAL_ARRAY_HH
-#include <dynamicGraph/signal-base.h>
-#include <dynamicGraph/dynamicGraph-API.h>
+#include <dynamic-graph/signal-base.h>
+#include <dynamic-graph/dynamicGraph-API.h>
namespace dynamicgraph {
diff --git a/src/signal/signal-base.h b/src/signal/signal-base.h
index c78421a..583c278 100644
--- a/src/signal/signal-base.h
+++ b/src/signal/signal-base.h
@@ -27,7 +27,7 @@
#include <sstream>
#include <iostream>
-#include <dynamicGraph/exception-signal.h>
+#include <dynamic-graph/exception-signal.h>
#include <boost/noncopyable.hpp>
namespace dynamicgraph {
diff --git a/src/signal/signal-ptr.h b/src/signal/signal-ptr.h
index 762e1e3..9506765 100644
--- a/src/signal/signal-ptr.h
+++ b/src/signal/signal-ptr.h
@@ -25,8 +25,8 @@
#include <iostream>
-#include <dynamicGraph/exception-signal.h>
-#include <dynamicGraph/signal.h>
+#include <dynamic-graph/exception-signal.h>
+#include <dynamic-graph/signal.h>
namespace dynamicgraph {
@@ -135,7 +135,7 @@ class SignalPtr
} // namespace dynamicgraph
-#include <dynamicGraph/signal-ptr.t.cpp>
+#include <dynamic-graph/signal-ptr.t.cpp>
#endif // #ifndef __SIGNAL_PTR_HH
diff --git a/src/signal/signal-ptr.t.cpp b/src/signal/signal-ptr.t.cpp
index f4e111e..ceb82f9 100644
--- a/src/signal/signal-ptr.t.cpp
+++ b/src/signal/signal-ptr.t.cpp
@@ -23,11 +23,11 @@
#ifndef __SIGNAL_PTR_TCPP
#define __SIGNAL_PTR_TCPP
-#include <dynamicGraph/signal-ptr.h>
+#include <dynamic-graph/signal-ptr.h>
#undef VP_TEMPLATE_DEBUG_MODE
#define VP_TEMPLATE_DEBUG_MODE 0
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/debug.h>
using namespace dynamicgraph;
diff --git a/src/signal/signal-time-dependant.h b/src/signal/signal-time-dependant.h
index 0e1e59e..06cbc09 100644
--- a/src/signal/signal-time-dependant.h
+++ b/src/signal/signal-time-dependant.h
@@ -23,9 +23,9 @@
#ifndef __DEPENDANT_SIGNAL_HH
#define __DEPENDANT_SIGNAL_HH
-#include <dynamicGraph/signal.h>
+#include <dynamic-graph/signal.h>
-#include <dynamicGraph/time-dependency.h>
+#include <dynamic-graph/time-dependency.h>
namespace dynamicgraph {
diff --git a/src/signal/signal.h b/src/signal/signal.h
index 1773f20..e3a282a 100644
--- a/src/signal/signal.h
+++ b/src/signal/signal.h
@@ -29,8 +29,8 @@
#include <string>
#include <iostream>
-#include <dynamicGraph/exception-signal.h>
-#include <dynamicGraph/signal-base.h>
+#include <dynamic-graph/exception-signal.h>
+#include <dynamic-graph/signal-base.h>
#ifdef HAVE_LIBBOOST_THREAD
@@ -131,7 +131,7 @@ protected:
} // namespace dynamicgraph
-#include <dynamicGraph/signal.t.cpp>
+#include <dynamic-graph/signal.t.cpp>
#endif // #ifndef __SIGNAL_HH
diff --git a/src/signal/signal.t.cpp b/src/signal/signal.t.cpp
index 61a71a4..5ca9066 100644
--- a/src/signal/signal.t.cpp
+++ b/src/signal/signal.t.cpp
@@ -23,11 +23,11 @@
#define __SIGNAL_TEMPLATE
-#include <dynamicGraph/signal.h>
+#include <dynamic-graph/signal.h>
#undef VP_TEMPLATE_DEBUG_MODE
#define VP_TEMPLATE_DEBUG_MODE 0
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/debug.h>
using namespace dynamicgraph;
diff --git a/src/signal/time-dependency.h b/src/signal/time-dependency.h
index 77b7957..aabb3be 100644
--- a/src/signal/time-dependency.h
+++ b/src/signal/time-dependency.h
@@ -26,8 +26,8 @@
#include <list>
#include <iostream>
-#include <dynamicGraph/signal-base.h>
-#include <dynamicGraph/signal-array.h>
+#include <dynamic-graph/signal-base.h>
+#include <dynamic-graph/signal-array.h>
template< class Time >
class TimeDependancy
@@ -90,6 +90,6 @@ class TimeDependancy
};
-#include <dynamicGraph/time-dependency.t.cpp>
+#include <dynamic-graph/time-dependency.t.cpp>
#endif /* #ifndef __TIME_DEPENDANCY_HH */
diff --git a/src/signal/time-dependency.t.cpp b/src/signal/time-dependency.t.cpp
index ad8abce..9df41c3 100644
--- a/src/signal/time-dependency.t.cpp
+++ b/src/signal/time-dependency.t.cpp
@@ -23,13 +23,13 @@
#ifndef __TIME_DEPENDANCY_TCPP
#define __TIME_DEPENDANCY_TCPP
-#include <dynamicGraph/time-dependency.h>
+#include <dynamic-graph/time-dependency.h>
using namespace dynamicgraph;
#undef VP_TEMPLATE_DEBUG_MODE
#define VP_TEMPLATE_DEBUG_MODE 0
-#include <dynamicGraph/debug.h>
+#include <dynamic-graph/debug.h>
#define __TIME_DEPENDANCY_INIT(sig,dep) \
leader(*sig) \
--
GitLab