Merged in fix/raisim_folder (pull request #465)

Fix/raisim folder

Author: farbod-farshidian

ocs2_core/include/ocs2_core/misc/CommandLine.h

@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <chrono>
 #include <iostream>
 #include <iterator>
+#include <sstream>
 #include <string>
 #include <thread>
 #include <vector>

ocs2_msgs/CMakeLists.txt

@@ -1,38 +1,36 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(ocs2_msgs)
 
-set(CATKIN_PACKAGE_DEPENDENCIES std_msgs)
-
 find_package(catkin REQUIRED
-    COMPONENTS
-        ${CATKIN_PACKAGE_DEPENDENCIES}
-        message_generation
+  COMPONENTS
+    std_msgs
+    message_generation
 )
 
 add_message_files(
-    FILES
-        mpc_state.msg
-        mpc_input.msg
-        mode_schedule.msg
-        mpc_observation.msg
-        mpc_performance_indices.msg
-        mpc_target_trajectories.msg
-        controller_data.msg
-        mpc_flattened_controller.msg
+  FILES
+    mpc_state.msg
+    mpc_input.msg
+    mode_schedule.msg
+    mpc_observation.msg
+    mpc_performance_indices.msg
+    mpc_target_trajectories.msg
+    controller_data.msg
+    mpc_flattened_controller.msg
 )
 
 add_service_files(
-    FILES
-        reset.srv
+  FILES
+    reset.srv
 )
 
 generate_messages(
-    DEPENDENCIES
-        ${CATKIN_PACKAGE_DEPENDENCIES}
+  DEPENDENCIES
+    std_msgs
 )
 
 catkin_package(
-    CATKIN_DEPENDS
-        ${CATKIN_PACKAGE_DEPENDENCIES}
-        message_runtime
+  CATKIN_DEPENDS
+    std_msgs
+    message_runtime
 )

ocs2_raisim/CMakeLists.txt renamed to ocs2_raisim/ocs2_raisim/CMakeLists.txt

@@ -31,10 +31,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdlib>
 
-#include <ocs2_oc/rollout/RolloutBase.h>
-#include <ocs2_raisim/RaisimRolloutSettings.h>
 #include <raisim/World.hpp>
 
+#include <ocs2_oc/rollout/RolloutBase.h>
+
+#include "ocs2_raisim/RaisimRolloutSettings.h"
+
 #ifdef USE_RAISIM_VISUALIZER
 #include <raisim/OgreVis.hpp>
 #endif

ocs2_raisim/include/ocs2_raisim/RaisimRollout.h renamed to ocs2_raisim/ocs2_raisim/include/ocs2_raisim/RaisimRollout.h

@@ -27,7 +27,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
-#include <ocs2_raisim/RaisimRollout.h>
+#include "ocs2_raisim/RaisimRollout.h"
 
 namespace ocs2 {
 

ocs2_raisim/include/ocs2_raisim/RaisimRolloutSettings.h renamed to ocs2_raisim/ocs2_raisim/include/ocs2_raisim/RaisimRolloutSettings.h

@@ -0,0 +1,35 @@
+/******************************************************************************
+Copyright (c) 2017, Farbod Farshidian. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+******************************************************************************/
+
+#include "ocs2_raisim/RaisimRollout.h"
+#include "ocs2_raisim/RaisimRolloutSettings.h"
+
+int main() {
+  return 0;
+}

ocs2_raisim/package.xml renamed to ocs2_raisim/ocs2_raisim/package.xml

@@ -1,3 +1,32 @@
+/******************************************************************************
+Copyright (c) 2017, Farbod Farshidian. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+ * Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+
 #include <grid_map_msgs/GridMap.h>
 #include <ros/node_handle.h>
 #include <ros/publisher.h>