Skip to content

Commit

Permalink
Merge pull request #166 from fawkesrobotics/thofmann/buildkite-fedora30
Browse files Browse the repository at this point in the history
Upgrade buildkite builds to Fedora 30
  • Loading branch information
morxa authored Sep 25, 2019
2 parents 14ab340 + 5fa4bfa commit bcbbac4
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 89 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ merged-pr-plugin: &merged-pr-plugin
mode: checkout

docker-plugin-base: &docker-plugin-base
image: fawkesrobotics/fawkes-builder:fedora29-kinetic
image: fawkesrobotics/fawkes-builder:fedora30-melodic
always-pull: true
debug: true
environment: ["BUILDKITE", "BUILDKITE_LABEL"]
Expand Down
2 changes: 1 addition & 1 deletion src/libs/blackboard/blackboard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ namespace fawkes {
* @return true if the aliveness could be restored and the BlackBoard is
* operational again, false otherwise.
*
* @fn std::list<Interface *> BlackBoard::open_multiple_for_reading(const char *type_pattern, const char *id_pattern = "*", const char *owner = NULL)
* @fn std::list<Interface *> BlackBoard::open_multiple_for_reading(const char *type_pattern, const char *id_pattern, const char *owner)
* Open multiple interfaces for reading.
* This will create interface instances for currently registered interfaces of
* the given type that match the given ID pattern. The result can be casted to
Expand Down
2 changes: 1 addition & 1 deletion src/libs/core/assert_exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
#define assert(expr) \
((expr) ? __ASSERT_VOID_CAST(0) \
: throw fawkes::Exception( \
"Assertion '%s' failed in %s:%u", __STRING(expr), __FILE__, __LINE__))
"Assertion '%s' failed in %s:%u", __STRING(expr), __FILE__, __LINE__))

#endif
12 changes: 2 additions & 10 deletions src/libs/core/threading/thread_loop_listener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ namespace fawkes {
* tasks, which are executed before and after every loop.
*
* @author Till Hofmann
*
* @fn void ThreadLoopListener::pre_loop(Thread thread*)
* This is called by the thread every time before loop() is called.
* @param thread thread whose loop() is will be called.
*
* @fn void ThreadLoopListener::post_loop(Thread thread*)
* This is called by the thread every time after loop() returned.
* @param thread thread whose loop() just returned.
*/

/** Virtual empty destructor. */
Expand All @@ -47,7 +39,7 @@ ThreadLoopListener::~ThreadLoopListener()
}

/** Empty stub for the pre loop function of the loop listener.
* This function is called right before the loop of the thread with the aspect.
* This function is called by the thread every time before loop() is called.
* Provide a stub such that not every derived class must implement the function.
* @param thread thread this loop listener belongs to
*/
Expand All @@ -57,7 +49,7 @@ ThreadLoopListener::pre_loop(Thread *thread)
}

/** Empty stub for the post loop function of the loop listener.
* This function is called right after the loop of the thread with the aspect.
* This function is called by the thread every time after loop() returned.
* Provide a stub such that not every derived class must implement the function.
* @param thread thread this loop listener belongs to
*/
Expand Down
8 changes: 0 additions & 8 deletions src/libs/fvclassifiers/border_shrinker.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ class ROI;
class BorderShrinker : public Shrinker
{
public:
/** CloseShrinker shrinks ROIs
* It will make sure that any ROI that passes it will NOT be in the border regions
* denoted by the pixels
* @param border_left left pixel margin
* @param border_right right pixel margin
* @param border_top top pixel margin
* @param border_bottom botto pixel margin
*/
BorderShrinker(unsigned int border_left = 0,
unsigned int border_right = 0,
unsigned int border_top = 0,
Expand Down
23 changes: 16 additions & 7 deletions src/libs/fvmodels/shape/ht_lines.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,22 @@ namespace firevision {
*/

/** Constructor.
* @param nr_candidates number of candidates
* @param angle_from slope of lines from
* @param angle_range angle range
* @param r_scale r scale
* @param min_votes_ratio min votes ratio
* @param min_votes minimum number of votes for a candidate to consider
*/
* Creates a new HtLinesModel instance
* @param nr_candidates the nr of candidates that is considered per pixel (the hole angle
* range is devided in this many parts/lines
* @param angle_from The angle to start the candidates from, given in rad, 0 is straight up
* @param angle_range the angle range the candidates are taken from starting at angle_from,
* given in rad, can be used for example to only search for horizontal lines
* @param r_scale This can be done to reduce the size of the hough space and to map more lines
* to one line
* @param min_votes_ratio The minimum ratio num_votes_per_line/total_num_votes that we have to
* have before a point in the hough space is considered to be a line,
* this may actually be higher if you use min_votes and set it to a higher
* number (set min_votes to 0 to only use min_votes_ration)
* @param min_votes the minimum number of votes a point in the hough space has to have before it
* is considered to be a line. The number may actually be higher if min_votes_ratio
* is set too high (set min_votes_ration to 0 to use only min_votes)
*/
HtLinesModel::HtLinesModel(unsigned int nr_candidates,
float angle_from,
float angle_range,
Expand Down
16 changes: 0 additions & 16 deletions src/libs/fvmodels/shape/ht_lines.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,6 @@ class HtLinesModel : public ShapeModel
RhtAccumulator accumulator;

public:
/** Creates a new HtLinesModel instance
* @param nr_candidates the nr of candidates that is considered per pixel (the hole angle
* range is devided in this many parts/lines
* @param angle_from The angle to start the candidates from, given in rad, 0 is straight up
* @param angle_range the angle range the candidates are taken from starting at angle_from,
* given in rad, can be used for example to only search for horizontal lines
* @param r_scale This can be done to reduce the size of the hough space and to map more lines
* to one line
* @param min_votes_ratio The minimum ratio num_votes_per_line/total_num_votes that we have to
* have before a point in the hough space is considered to be a line,
* this may actually be higher if you use min_votes and set it to a higher
* number (set min_votes to 0 to only use min_votes_ration)
* @param min_votes the minimum number of votes a point in the hough space has to have before it
* is considered to be a line. The number may actually be higher if min_votes_ratio
* is set too high (set min_votes_ration to 0 to use only min_votes)
*/
HtLinesModel(unsigned int nr_candidates = 40,
float angle_from = 0,
float angle_range = 2 * M_PI,
Expand Down
8 changes: 3 additions & 5 deletions src/libs/syncpoint/tests/test_syncpoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,12 @@ class SyncPointTest : public ::testing::Test
delete logger_;
}

/**@{*/
/**
* Syncpoints for testing purposes
*/
/** A syncpoint for testing */
RefPtr<SyncPoint> sp1;
/** A syncpoint for testing */
RefPtr<SyncPoint> sp2;
/** A syncpoint for testing */
RefPtr<SyncPoint> sp3;
/**@}*/

/** Logger for testing */
MultiLogger *logger_;
Expand Down
5 changes: 0 additions & 5 deletions src/libs/webview/request.h
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,6 @@ class WebRequest
cookies_[key] = value;
}

/** Set a POST value.
* @param key key of the cookie
* @param data incoming data
* @param size size in bytes of @p data
*/
void set_post_value(const char *key, const char *data, size_t size);

/** Set a GET value.
Expand Down
64 changes: 30 additions & 34 deletions src/plugins/asp/aspect/clingo_access.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,28 +272,23 @@ ClingoAccess::alloc_control()
argumentsChar.push_back(argumentsString.back().c_str());
}

control_ = new Clingo::Control(argumentsChar,
[this](const Clingo::WarningCode code, char const *msg) {
fawkes::Logger::LogLevel level = fawkes::Logger::LL_NONE;
switch (code) {
case Clingo::WarningCode::AtomUndefined:
case Clingo::WarningCode::OperationUndefined:
case Clingo::WarningCode::RuntimeError:
level = fawkes::Logger::LL_ERROR;
break;
case Clingo::WarningCode::Other:
case Clingo::WarningCode::VariableUnbounded:
level = fawkes::Logger::LL_WARN;
break;
case Clingo::WarningCode::FileIncluded:
case Clingo::WarningCode::GlobalVariable:
level = fawkes::Logger::LL_INFO;
break;
}
logger_->log(level, log_comp_.c_str(), msg);
return;
},
100);
control_ = new Clingo::Control(
argumentsChar,
[this](const Clingo::WarningCode code, char const *msg) {
fawkes::Logger::LogLevel level = fawkes::Logger::LL_NONE;
switch (code) {
case Clingo::WarningCode::AtomUndefined:
case Clingo::WarningCode::OperationUndefined:
case Clingo::WarningCode::RuntimeError: level = fawkes::Logger::LL_ERROR; break;
case Clingo::WarningCode::Other:
case Clingo::WarningCode::VariableUnbounded: level = fawkes::Logger::LL_WARN; break;
case Clingo::WarningCode::FileIncluded:
case Clingo::WarningCode::GlobalVariable: level = fawkes::Logger::LL_INFO; break;
}
logger_->log(level, log_comp_.c_str(), msg);
return;
},
100);
return;
}

Expand Down Expand Up @@ -617,18 +612,19 @@ ClingoAccess::assign_external(const Clingo::Symbol &atom, const Clingo::TruthVal
}

if (debug_level_ >= ASP_DBG_EXTERNALS) {
logger_->log_info(log_comp_.c_str(),
"Assigning %s to %s.",
[value](void) {
const char *ret = "Unknown Value";
switch (value) {
case Clingo::TruthValue::Free: ret = "Free"; break;
case Clingo::TruthValue::True: ret = "True"; break;
case Clingo::TruthValue::False: ret = "False"; break;
}
return ret;
}(),
atom.to_string().c_str());
logger_->log_info(
log_comp_.c_str(),
"Assigning %s to %s.",
[value](void) {
const char *ret = "Unknown Value";
switch (value) {
case Clingo::TruthValue::Free: ret = "Free"; break;
case Clingo::TruthValue::True: ret = "True"; break;
case Clingo::TruthValue::False: ret = "False"; break;
}
return ret;
}(),
atom.to_string().c_str());
}
control_->assign_external(atom, value);
return true;
Expand Down
1 change: 0 additions & 1 deletion src/plugins/perception/pcl-db/pcl_db_retrieve_pipeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class PointCloudDBRetrievePipeline : public PointCloudDBPipeline<PointType>
* @param mongodb_client MongoDB client
* @param config configuration
* @param logger Logger
* @param output output point cloud
* @param transformer TF transformer for point cloud transformations between
* coordinate reference frames
* @param original input point cloud
Expand Down

0 comments on commit bcbbac4

Please sign in to comment.