Skip to content
Permalink
Browse files

* Changed log levels for most LOG_ALWAYS messages to LOG_MAJOR in Osc…

…Platforms

* Added numbers 6-9 in the spell algorithm
* Added more plots per graph in the plot.sh script
* Updated boost build system files
  • Loading branch information...
jredmondson committed Mar 12, 2019
1 parent 7bf73b6 commit 7d4e8dc3f5de0a23aef2c9c6f20985415eae9eed
@@ -1,4 +1,6 @@
project {


expand(BOOST_ROOT_LIB) {
$BOOST_ROOT_LIB
$(BOOST_ROOT)/stage/lib
@@ -37,13 +39,16 @@ project {
specific(prop:windows) {
libpaths += $(BOOST_ROOT_LIB)
includes += $(BOOST_ROOT)

macros += _WINSOCK_DEPRECATED_NO_WARNINGS BOOST_ALL_NO_LIB

Debug::lit_libs += $(BOOST_SYSTEM_DEBUG)
Release::lit_libs += $(BOOST_SYSTEM_RELEASE)
// end if windows build
} else {
lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_system$(BOOST_CFG)
libpaths += /usr/local/lib
libpaths += /usr/local/Cellar/boost@1.59/1.59.0/lib
includes += /usr/local/Cellar/boost@1.59/1.59.0/include
}
}
@@ -21,7 +21,7 @@ membersInGroup=3
`cp config_template.yaml config.yaml`
plotsString=""
iterations=$(($membersValue/$membersInGroup))
pointsPerPlot=40
pointsPerPlot=80
for ((plotNumber=0; plotNumber<$iterations ;++plotNumber)); do
first=$((plotNumber*$membersInGroup))
second=$(($first+$membersInGroup-1))
@@ -650,9 +650,9 @@ std::map<char, Letter> create_letters_map ()
{{{1.0, 1.0}}, {{0.5, 1}}, {{0.0, 1.0}}, {{0.5, 1}}},
}},
{'0', {
{{{0.5, 0}}, {{1, 0.3}}, {{1, 0.7}}, {{0.5, 1}}, {{0, 0.7}}, {{0, 0.3}}, },
{{{1, 0.7}}, {{0.5, 1}}, {{0, 0.7}}, {{0, 0.3}}, {{0.5, 0}}, {{1, 0.3}}, },
{{{0, 0.7}}, {{0, 0.3}}, {{0.5, 0}}, {{1, 0.3}}, {{1, 0.7}}, {{0.5, 1}}, },
{{{0.0, 0.0}}, {{1.0, 0.0}}, {{1.0, 0.5}}, {{1.0, 0.0}}},
{{{1.0, 0.5}}, {{1.0, 1.0}}, {{0.0, 1.0}}, {{1.0, 1.0}}},
{{{0.0, 1.0}}, {{0.0, 0.5}}, {{0.0, 0.0}}, {{0.0, 0.5}}},
}},
{'1', {
{{{0.0, 0.3}}, {{0.25, 0.15}}, {{0.5, 0.0}}, {{0.25, 0.15}}},
@@ -679,6 +679,26 @@ std::map<char, Letter> create_letters_map ()
{{{0.0, 0.5}}, {{0.5, 0.5}}, {{1.0, 0.75}}, {{0.5, 0.5}}},
{{{1.0, 0.75}}, {{0.5, 1.0}}, {{0.0, 1.0}}, {{0.5, 1.0}}},
}},
{'6', {
{{{0.0, 0.75}}, {{0.125, 0.5}}, {{0.25, 0.25}}, {{0.375, 0.0}}, {{0.25, 0.25}}, {{0.125, 0.5}}},
{{{0.33, 0.5}}, {{0.66, 0.5}}, {{1.0, 0.75}}, {{0.66, 1.0}}, {{1.0, 0.75}}, {{0.66, 0.5}}},
{{{0.33, 1.0}}, {{0.0, 0.75}}, {{0.33, 0.5}}, {{0.0, 0.75}}, {{0.33, 1.0}}, {{0.66, 1.0}}},
}},
{'7', {
{{{0.5, 0.0}}, {{0.0, 0.0}}, {{0.5, 0.0}}, {{1.0, 0.0}}},
{{{0.8, 0.25}}, {{1.0, 0.0}}, {{0.8, 0.25}}, {{0.6, 0.5}}},
{{{0.4, 0.75}}, {{0.6, 0.5}}, {{0.4, 0.75}}, {{0.2, 1.0}}},
}},
{'8', {
{{{0.33, 0.0}}, {{0.66, 0.0}}, {{1.0, 0.25}}, {{0.66, 0.0}}, {{0.33, 0.0}}, {{0.0, 0.25}}, {{0.33, 0.5}}, {{0.0, 0.25}}},
{{{1.0, 0.25}}, {{0.66, 0.5}}, {{1.0, 0.75}}, {{0.66, 0.5}}, {{0.33, 0.5}}, {{0.66, 0.5}}, {{1.0, 0.25}}, {{0.66, 0.5}}},
{{{0.33, 1.0}}, {{0.0, 0.75}}, {{0.33, 0.5}}, {{0.0, 0.75}}, {{0.33, 1.0}}, {{0.66, 1.0}}, {{1.0, 0.75}}, {{0.66, 1.0}}},
}},
{'9', {
{{{0.66, 0.0}}, {{1.0, 0.25}}, {{0.66, 0.5}}, {{1.0, 0.25}}, {{0.66, 0.0}}, {{0.33, 0.0}}},
{{{0.66, 0.5}}, {{0.33, 0.5}}, {{0.0, 0.25}}, {{0.33, 0.0}}, {{0.0, 0.25}}, {{0.33, 0.5}}},
{{{1.0, 0.25}}, {{0.875, 0.5}}, {{0.75, 0.75}}, {{0.625, 1.0}}, {{0.75, 0.75}}, {{0.875, 0.5}}},
}},
};
}

@@ -834,7 +834,7 @@ gams::platforms::OscJoystickPlatform::move(const pose::Position & target,
}

madara_logger_ptr_log(gams::loggers::global_logger.get(),
gams::loggers::LOG_ALWAYS,
gams::loggers::LOG_MAJOR,
"gams::platforms::OscJoystickPlatform::move:" \
" %s: moving to new target at time %f with modified velocity "
"[%f,%f,%f]\n",
@@ -635,7 +635,7 @@ gams::platforms::OscPlatform::move(const pose::Position & target,
}

madara_logger_ptr_log(gams::loggers::global_logger.get(),
gams::loggers::LOG_ALWAYS,
gams::loggers::LOG_MAJOR,
"gams::platforms::OscPlatform::move:" \
" %s: moving to new target at time %f with modified velocity "
"[%f,%f,%f]\n",
@@ -47,7 +47,7 @@ project {
// end if windows build
} else {
lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_system$(BOOST_CFG)
libpaths += /usr/local/lib
libpaths += /usr/local/lib
libpaths += /usr/local/Cellar/boost@1.59/1.59.0/lib
includes += /usr/local/Cellar/boost@1.59/1.59.0/include
}

0 comments on commit 7d4e8dc

Please sign in to comment.
You can’t perform that action at this time.