Skip to content

GitLab

Verified Commit 56b32f32 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

lua: remove support 

This feature is obselete for a while and no used by anybody. Stop the support.
parent 4d283163
Expand all Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 56b32f32
#
# Copyright (c) 2015-2019 CNRS INRIA
# Copyright (c) 2015-2020 CNRS INRIA
# Copyright (c) 2015 Wandercraft, 86 rue de Paris 91400 Orsay, France.
#
......@@ -43,7 +43,6 @@ ENDIF(WIN32)
OPTION (BUILD_BENCHMARK "Build the benchmarks" OFF)
OPTION (BUILD_UTILS "Build the utils" OFF)
OPTION (BUILD_PYTHON_INTERFACE "Build the python binding" ON)
OPTION (BUILD_WITH_LUA_SUPPORT "Build the lua parser" OFF)
OPTION (BUILD_WITH_COMMIT_VERSION "Build libraries by setting specific commit version" OFF)
IF(DEFINED BUILD_UNIT_TESTS)
......@@ -136,26 +135,6 @@ IF(URDFDOM_FOUND AND BUILD_WITH_URDF_SUPPORT)
ENDIF(${URDFDOM_VERSION} VERSION_GREATER "0.4.2")
ENDIF(URDFDOM_FOUND AND BUILD_WITH_URDF_SUPPORT)
# Special care of lua which can be of versions 5.1 or 5.2
# Priority is set to lua5.2
IF(BUILD_WITH_LUA_SUPPORT)
ADD_OPTIONAL_DEPENDENCY("lua5.2")
IF(LUA5_2_FOUND)
SET(LUA5_FOUND TRUE)
SET(LUA5_PACKAGE "lua5.2")
ADD_DEFINITIONS(-DPINOCCHIO_LUA_VERSION_GREATER_5_2)
PKG_CONFIG_APPEND_CFLAGS("-DPINOCCHIO_LUA_VERSION_GREATER_5_2")
ELSE(LUA5_2_FOUND)
ADD_OPTIONAL_DEPENDENCY("lua5.1")
IF(LUA5_1_FOUND)
SET(LUA5_FOUND TRUE)
SET(LUA5_PACKAGE "lua5.1")
ELSE(LUA5_1_FOUND)
MESSAGE(FATAL_ERROR "Cannot find a suitable version of Lua 5.1 or 5.2")
ENDIF(LUA5_1_FOUND)
ENDIF(LUA5_2_FOUND)
ENDIF(BUILD_WITH_LUA_SUPPORT)
SET(BOOST_REQUIRED_COMPONENTS filesystem serialization system)
SET(BOOST_BUILD_COMPONENTS unit_test_framework)
SET(BOOST_OPTIONAL_COMPONENTS "")
......@@ -212,16 +191,6 @@ ELSE(HPP_FCL_FOUND)
)
ENDIF(HPP_FCL_FOUND)
IF(LUA5_FOUND)
ADD_DEFINITIONS(-DPINOCCHIO_WITH_LUA5)
LIST(APPEND CFLAGS_DEPENDENCIES "-DPINOCCHIO_WITH_LUA5")
ELSE(LUA5_FOUND)
LIST(REMOVE_ITEM HEADERS
${PROJECT_SOURCE_DIR}/src/parsers/lua.hpp
${PROJECT_SOURCE_DIR}/src/parsers/lua/lua_tables.hpp
)
ENDIF(LUA5_FOUND)
LIST(APPEND HEADERS macros.hpp)
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio")
......@@ -232,7 +201,6 @@ MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/multibody")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/multibody/joint")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/multibody/liegroup")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/multibody/visitor")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/parsers/lua")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/parsers")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/parsers/urdf")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/utils")
......
bindings/python/parsers/parsers.hpp
View file @ 56b32f32
......@@ -15,10 +15,6 @@
#include "pinocchio/bindings/python/multibody/geometry-model.hpp"
#include "pinocchio/bindings/python/multibody/geometry-data.hpp"
#ifdef PINOCCHIO_WITH_LUA5
#include "pinocchio/parsers/lua.hpp"
#endif // #ifdef PINOCCHIO_WITH_LUA5
#include "pinocchio/parsers/srdf.hpp"
namespace pinocchio
......@@ -257,18 +253,6 @@ namespace pinocchio
#endif // #ifdef PINOCCHIO_WITH_HPP_FCL
#endif // #ifdef PINOCCHIO_WITH_URDFDOM
#ifdef PINOCCHIO_WITH_LUA5
static Model buildModelFromLua(const std::string & filename,
bool ff,
bool verbose
)
{
Model model;
model = pinocchio::lua::buildModel(filename, ff, verbose);
return model;
}
#endif // #ifdef PINOCCHIO_WITH_LUA5
BOOST_PYTHON_FUNCTION_OVERLOADS(loadReferenceConfigurations_overload,
srdf::loadReferenceConfigurations,
......@@ -542,14 +526,6 @@ namespace pinocchio
#endif // #ifdef PINOCCHIO_WITH_HPP_FCL
#endif // #ifdef PINOCCHIO_WITH_URDFDOM
#ifdef PINOCCHIO_WITH_LUA5
bp::def("buildModelFromLua",buildModelFromLua,
bp::args("Filename (string)",
"Free flyer (bool, false for a fixed robot)",
"Verbose option "),
"Parse the URDF file given in input and return a proper pinocchio model");
#endif // #ifdef PINOCCHIO_WITH_LUA5
bp::def("loadReferenceConfigurations",
static_cast<void (*)(Model &, const std::string &, const bool)>(&srdf::loadReferenceConfigurations),
......
bindings/python/utils/dependencies.cpp
View file @ 56b32f32
//
// Copyright (c) 2019 INRIA
// Copyright (c) 2020 INRIA
//
#include <boost/python.hpp>
......@@ -27,13 +27,6 @@ namespace pinocchio
false;
#endif
bp::scope().attr("WITH_LUA5") =
#ifdef PINOCCHIO_WITH_LUA5
true;
#else
false;
#endif
bp::scope().attr("WITH_CPPAD") =
#ifdef PINOCCHIO_WITH_CPPAD
true;
......
models/simple_model.lua deleted 100644 → 0
View file @ 4d283163
inertia = {
{1.1, 0.1, 0.2},
{0.1, 1.2, 0.4},
{0.2, 0.4, 1.3}
}
pelvis = { mass = 9.3, com = { 1.1, 1.2, 1.3}, inertia = inertia }
thigh = { mass = 4.2, com = { 1.1, 1.2, 1.3}, inertia = inertia }
shank = { mass = 4.1, com = { 1.1, 1.2, 1.3}, inertia = inertia }
foot = { mass = 1.1, com = { 1.1, 1.2, 1.3}, inertia = inertia }
bodies = {
pelvis = pelvis,
thigh_right = thigh,
shank_right = shank,
thigh_left = thigh,
shank_left = shank
}
joints = {
freeflyer = {
'JointTypeFloatingBase'
},
spherical_zyx = {
'JointTypeEulerZYX'
},
rotational_y = {
'JointTypeRevoluteY'
},
fixed = {},
}
model = {
frames = {
{
name = "pelvis",
--parent = "ROOT",
body = bodies.pelvis,
--joint = joints.freeflyer,
},
{
name = "thigh_right",
parent = "pelvis",
body = bodies.thigh_right,
joint = joints.spherical_zyx,
joint_name = "hip_right",
},
{
name = "shank_right",
parent = "thigh_right",
body = bodies.thigh_right,
joint = joints.rotational_y
},
{
name = "foot_right",
parent = "shank_right",
body = bodies.thigh_right,
joint = joints.fixed
},
{
name = "thigh_left",
parent = "pelvis",
body = bodies.thigh_left,
joint = joints.spherical_zyx,
joint_name = "hip_left",
},
{
name = "shank_left",
parent = "thigh_left",
body = bodies.thigh_left,
joint = joints.rotational_y
},
{
name = "foot_left",
parent = "shank_left",
body = bodies.thigh_left,
joint = joints.fixed
},
}
}
return model
src/CMakeLists.txt
View file @ 56b32f32
#
# Copyright (c) 2015-2019 CNRS INRIA
# Copyright (c) 2015-2020 CNRS INRIA
# Copyright (c) 2015 Wandercraft, 86 rue de Paris 91400 Orsay, France.
#
......@@ -7,13 +7,6 @@
# --- C++ --------------------------------------------
# ----------------------------------------------------
IF(LUA5_FOUND)
LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES
parsers/lua/lua_tables.cpp
parsers/lua.cpp
)
ENDIF(LUA5_FOUND)
SET(${PROJECT_NAME}_SOURCES
${${PROJECT_NAME}_PARSERS_SOURCES}
)
......@@ -36,10 +29,6 @@ IF(UNIX)
PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} hpp-fcl)
ENDIF(HPP_FCL_FOUND)
IF(LUA5_FOUND)
PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} ${LUA5_PACKAGE})
ENDIF(LUA5_FOUND)
ADD_HEADER_GROUP(HEADERS)
ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
......
src/deprecated-macros.hpp
View file @ 56b32f32
......@@ -17,10 +17,4 @@
#endif
#endif
#ifdef PINOCCHIO_WITH_LUA5
#ifdef PINOCCHIO_ENABLE_COMPATIBILITY_WITH_VERSION_1 // for backward compatibility
#define WITH_LUA5
#endif
#endif
#endif // ifndef __pinocchio_deprecated_macros_hpp__
src/parsers/lua.cpp deleted 100644 → 0
View file @ 4d283163
//
// Copyright (c) 2015-2016 CNRS
//
#include "pinocchio/parsers/lua/lua_tables.hpp"
#include "pinocchio/parsers/lua.hpp"
#include <lua.hpp>
#include <iostream>
#include <map>
#include <sstream>
#include "pinocchio/spatial/se3.hpp"
#include "pinocchio/spatial/motion.hpp"
#include "pinocchio/spatial/inertia.hpp"
#include "pinocchio/multibody/model.hpp"
typedef pinocchio::SE3::Vector3 Vector3;
typedef pinocchio::SE3::Matrix3 Matrix3;
template<> Vector3 LuaTableNode::getDefault<Vector3> (const Vector3 & default_value)
{
Vector3 result (default_value);
if (stackQueryValue()) {
LuaTable vector_table = LuaTable::fromLuaState (luaTable->L);
if (vector_table.length() != 3) {
std::cerr << "LuaModel Error: invalid 3d vector!" << std::endl;
abort();
}
result[0] = vector_table[1];
result[1] = vector_table[2];
result[2] = vector_table[3];
}
stackRestore();
return result;
}
template<> Matrix3 LuaTableNode::getDefault<Matrix3> (const Matrix3 & default_value)
{
Matrix3 result (default_value);
if (stackQueryValue()) {
LuaTable vector_table = LuaTable::fromLuaState (luaTable->L);
if (vector_table.length() != 3) {
std::cerr << "LuaModel Error: invalid 3d matrix!" << std::endl;
abort();
}
if (vector_table[1].length() != 3
|| vector_table[2].length() != 3
|| vector_table[3].length() != 3) {
std::cerr << "LuaModel Error: invalid 3d matrix!" << std::endl;
abort();
}
result(0,0) = vector_table[1][1];
result(0,1) = vector_table[1][2];
result(0,2) = vector_table[1][3];
result(1,0) = vector_table[2][1];
result(1,1) = vector_table[2][2];
result(1,2) = vector_table[2][3];
result(2,0) = vector_table[3][1];
result(2,1) = vector_table[3][2];
result(2,2) = vector_table[3][3];
}
stackRestore();
return result;
}
template<> pinocchio::SE3 LuaTableNode::getDefault<pinocchio::SE3> (const pinocchio::SE3 & default_value)
{
pinocchio::SE3 result (default_value);
if (stackQueryValue()) {
LuaTable vector_table = LuaTable::fromLuaState (luaTable->L);
result.translation() = vector_table["r"].getDefault<Vector3> (Vector3::Zero (3));
result.rotation().transpose() = vector_table["E"].getDefault<Matrix3> (Matrix3::Identity (3,3));
}
stackRestore();
return result;
}
template<> pinocchio::Inertia LuaTableNode::getDefault<pinocchio::Inertia> (const pinocchio::Inertia & default_value)
{
pinocchio::Inertia result (default_value);
if (stackQueryValue()) {
LuaTable vector_table = LuaTable::fromLuaState (luaTable->L);
double mass = 0.;
Vector3 com;
Matrix3 inertia_matrix;
mass = vector_table["mass"];
com = vector_table["com"].getDefault<Vector3> (Vector3::Zero ());
inertia_matrix = vector_table["inertia"].getDefault<Matrix3> (Matrix3::Identity ());
result = pinocchio::Inertia (mass, com, inertia_matrix);
}
stackRestore();
return result;
}
namespace pinocchio
{
namespace lua
{
template<typename JointModel>
Model::JointIndex addJointAndBody(Model & model, const JointModelBase<JointModel> & jmodel, const Model::JointIndex parent_id,
const SE3 & joint_placement, const std::string & joint_name, const Inertia & Y, const std::string & body_name)
{
Model::JointIndex idx;
idx = model.addJoint(parent_id,jmodel,
joint_placement,joint_name);
model.addJointFrame(idx);
model.appendBodyToJoint(idx,Y);
model.addBodyFrame(body_name, idx);
return idx;
}
bool LuaModelReadFromTable (LuaTable & model_table, Model & model, bool freeFlyer, bool verbose)
{
typedef std::map<std::string, Model::Index> mapStringIndex_t;
mapStringIndex_t body_table_id_map;
mapStringIndex_t fixed_body_table_id_map;
typedef std::map<std::string, SE3> mapStringSE3_t;
mapStringSE3_t fixed_placement_map;
if (model_table["gravity"].exists())
{
model.gravity.linear() = model_table["gravity"].get<Vector3> ();
if (verbose)
std::cout << "gravity = " << model.gravity.linear().transpose() << std::endl;
}
if (! model_table["frames"].exists())
{
std::cerr << "Frames table missing from model table - Abort" << std::endl;
abort();
}
size_t frame_count = model_table["frames"].length();
body_table_id_map["ROOT"] = 0;
for (int i = 1; i <= (int) frame_count; i++) {
std::stringstream body_name_default;
body_name_default << "body " << i;
std::string body_name = model_table["frames"][i]["name"].getDefault<std::string> (body_name_default.str());
std::string parent_name;
if (model_table["frames"][i]["parent"].exists ())
{
parent_name = model_table["frames"][i]["parent"].get<std::string> ();
}
else if (i == 1) // first body of the tree
{
parent_name = "ROOT";
}
else // no parent defined
{
std::cerr << "Parent not defined for frame " << i << "." << std::endl;
abort();
}
Model::JointIndex parent_id;
SE3 fixed_placement_offset (SE3::Identity());
if (body_table_id_map.find (parent_name) != body_table_id_map.end ())
{
parent_id = body_table_id_map[parent_name];
}
else if (fixed_body_table_id_map.find(parent_name) != fixed_body_table_id_map.end ()) // the parent is fixed in the kinematic tree
{
parent_id = fixed_body_table_id_map[parent_name];
fixed_placement_offset = fixed_placement_map[parent_name];
}
else
{
std::cerr << parent_name << " is not in the tree." << std::endl;
abort ();
}
std::stringstream joint_name_default;
joint_name_default << "joint " << i;
std::string joint_name = model_table["frames"][i]["joint_name"].getDefault<std::string> (joint_name_default.str());
SE3 joint_placement = model_table["frames"][i]["joint_frame"].getDefault<SE3> (SE3::Identity ());
SE3 global_placement (fixed_placement_offset * joint_placement); // placement due to the existence of fixed bodies
if (! model_table["frames"][i]["body"].exists()) {
std::cerr << "body field not defined for frame " << i << "." << std::endl;
abort();
}
Inertia Y = model_table["frames"][i]["body"].getDefault<Inertia> (Inertia::Identity ());
std::string joint_type;
if (model_table["frames"][i]["joint"].exists())
{
if (model_table["frames"][i]["joint"].length() == 0)
joint_type = "JointTypeFixed";
else if (model_table["frames"][i]["joint"].length() == 1)
joint_type = model_table["frames"][i]["joint"][1].getDefault<std::string> ("");
else
{
joint_type = model_table["frames"][i]["joint"][1].getDefault<std::string> ("");
std::cerr << "Joint compouned not yet implemented. Take only the first joint." << std::endl;
}
}
else if (i == 1) // first body of the tree
{
if (freeFlyer)
joint_type = "JointTypeFloatbase";
else
{
std::cerr << "The first segment is defined without any definition of joint type relatily to the world." << std::endl;
abort ();
}
}
else
{
std::cerr << "joint field not defined for frame " << i << "." << std::endl;
abort();
}
Model::JointIndex joint_id;
if (joint_type == "JointTypeRevoluteX")
{
joint_id = addJointAndBody(model,JointModelRX(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypeRevoluteY")
{
joint_id = addJointAndBody(model,JointModelRY(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypeRevoluteZ")
{
joint_id = addJointAndBody(model,JointModelRZ(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypePrismaticX")
{
joint_id = addJointAndBody(model,JointModelPX(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypePrismaticY")
{
joint_id = addJointAndBody(model,JointModelPY(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypePrismaticZ")
{
joint_id = addJointAndBody(model,JointModelPZ(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypeFloatingBase" || joint_type == "JointTypeFloatbase")
{
joint_id = addJointAndBody(model,JointModelFreeFlyer(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypeSpherical")
{
joint_id = addJointAndBody(model,JointModelSpherical(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypeEulerZYX")
{
joint_id = addJointAndBody(model,JointModelSphericalZYX(),parent_id,global_placement,joint_name,Y,body_name);
}
else if (joint_type == "JointTypeFixed")
{
model.appendBodyToJoint(parent_id, Y, global_placement);
// TODO Why not
// model.addBodyFrame(body_name, parent_id, global_placement);
// ???
model.addBodyFrame(randomStringGenerator(8), parent_id, global_placement);
joint_id = (Model::JointIndex)model.njoints;
fixed_body_table_id_map[body_name] = parent_id;
fixed_placement_map[body_name] = global_placement;
}
else
{
std::cerr << joint_type << " is not supported.." << std::endl;
abort ();
}
body_table_id_map[body_name] = joint_id;
if (verbose) {
std::cout << "==== Added Body ====" << std::endl;
std::cout << " joint name : " << joint_type << std::endl;
std::cout << " joint id : " << joint_id << std::endl;
std::cout << " joint parent id : " << parent_id << std::endl;
std::cout << " joint placement (wrt its parent):\n" << joint_placement << std::endl;
std::cout << " joint type : " << joint_type << std::endl;
std::cout << " body name : " << body_name << std::endl;
std::cout << " body inertia:\n" << Y << std::endl;
}
}
return true;
}
Model buildModel (const std::string & filename, bool freeFlyer, bool verbose)
{
Model model;
LuaTable model_table = LuaTable::fromFile (filename.c_str ());
LuaModelReadFromTable (model_table, model, freeFlyer, verbose);
return model;
}
} // namespace lua
} // namespace pinocchio
src/parsers/lua.hpp deleted 100644 → 0
View file @ 4d283163
//
// Copyright (c) 2015-2016 CNRS
//
#ifndef __pinocchio_lua_hpp__
#define __pinocchio_lua_hpp__
#include <string>
#include "pinocchio/multibody/model.hpp"
namespace pinocchio
{
namespace lua
{
Model buildModel (const std::string & filename, bool freeFlyer = false, bool verbose = false);
} // namespace lua
} // namespace pinocchio
#endif // ifndef __pinocchio_lua_hpp__
src/parsers/lua/lua_tables.cpp deleted 100644 → 0
View file @ 4d283163
This diff is collapsed.