[Fawkes Git] branch/common/current: created (1.0.1-1358-gbebf5a6)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been created at bebf5a6beef23073cdc7ac989e6ad598e183b10e (commit) http://git.fawkesrobotics.org/fawkes.git/common/current - *Log* --- commit acc0f9defd2487da0851ba9588141d2eb2d9 Merge: cf2d0cc 75cece3 Author: Till Hofmann AuthorDate: Thu Jun 7 22:16:57 2018 +0200 Commit: Till Hofmann CommitDate: Thu Jun 7 22:16:57 2018 +0200 Merge remote-tracking branch 'origin/thofmann/clips-executive-resources' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/acc0f9d http://trac.fawkesrobotics.org/changeset/acc0f9d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e759f42899f009000c9cad77b6c34725de353941 Merge: acc0f9d ba5f43e Author: Till Hofmann AuthorDate: Thu Jun 7 22:17:06 2018 +0200 Commit: Till Hofmann CommitDate: Thu Jun 7 22:17:06 2018 +0200 Merge remote-tracking branch 'origin/timn/cx-init-ordering' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/e759f42 http://trac.fawkesrobotics.org/changeset/e759f42 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit bebf5a6beef23073cdc7ac989e6ad598e183b10e Merge: e759f42 69f74a5 Author: Till Hofmann AuthorDate: Thu Jun 7 22:17:17 2018 +0200 Commit: Till Hofmann CommitDate: Thu Jun 7 22:17:17 2018 +0200 Merge remote-tracking branch 'origin/timn/cx-wm-robmem-sync-timestamp' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/bebf5a6 http://trac.fawkesrobotics.org/changeset/bebf5a6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/init.clp |4 ++-- .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- src/plugins/clips/aspect/clips_env_manager.cpp | 13 + src/plugins/clips/aspect/clips_env_manager.h |1 + src/plugins/clips/clips/time.clp |7 +++ 5 files changed, 25 insertions(+), 4 deletions(-) - *Diffs* - - *commit* acc0f9defd2487da0851ba9588141d2eb2d9 - - - - - - - - - - Author: Till Hofmann Date:Thu Jun 7 22:16:57 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-resources' into common/current src/plugins/clips-executive/clips/domain.clp |6 +- src/plugins/clips-executive/clips/plan.clp | 31 +++-- .../clips-executive/clips/resource-locks.clp | 144 .../clips/test-scenario/goal-reasoner.clp | 16 ++- .../clips-executive/clips/wm-domain-sync.clp |3 +- .../clips-executive/clips/wm-robmem-sync.clp | 15 ++- 6 files changed, 196 insertions(+), 19 deletions(-) _Diff for modified files_: - *commit* e759f42899f009000c9cad77b6c34725de353941 - - - - - - - - - - Author: Till Hofmann Date:Thu Jun 7 22:17:06 2018 +0200 Subject: Merge remote-tracking branch 'origin/timn/cx-init-ordering' into common/current src/plugins/clips-executive/clips/init.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: - *commit* bebf5a6beef23073cdc7ac989e6ad598e183b10e - - - - - - - - - - Author: Till Hofmann Date:Thu Jun 7 22:17:17 2018 +0200 Subject: Merge remote-tracking branch 'origin/timn/cx-wm-robmem-sync-timestamp' into common/current .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- src/plugins/clips/aspect/clips_env_manager.cpp | 13 + src/plugins/clips/aspect/clips_env_manager.h |1 + src/plugins/clips/clips/time.clp |7 +++ 4 files changed, 23 insertions(+), 2 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1421-g067ae6f)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 067ae6fb44f29b2f03f046a2d021ef7082ecd2dd (commit) via 95a782ccb5b178be938297f6e325109b4dab6918 (commit) from 0fa369ce9f2ec124e6c74de483cb25584daeacc7 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 067ae6fb44f29b2f03f046a2d021ef7082ecd2dd Merge: 0fa369c 95a782c Author: Till Hofmann AuthorDate: Sat Jun 16 12:02:38 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 12:02:38 2018 -0400 Merge remote-tracking branch 'origin/common/cx-wm-robmem-types' into current http://git.fawkesrobotics.org/fawkes.git/commit/067ae6f http://trac.fawkesrobotics.org/changeset/067ae6f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) - *Diffs* - - *commit* 067ae6fb44f29b2f03f046a2d021ef7082ecd2dd - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 12:02:38 2018 -0400 Subject: Merge remote-tracking branch 'origin/common/cx-wm-robmem-types' into current .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/cx-wm-robmem-types: created (1.0.1-1337-g95a782c)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/cx-wm-robmem-types has been created at 95a782ccb5b178be938297f6e325109b4dab6918 (commit) http://git.fawkesrobotics.org/fawkes.git/common/cx-wm-robmem-types - *Log* --- commit 95a782ccb5b178be938297f6e325109b4dab6918 Author: Till Hofmann AuthorDate: Sat Jun 16 12:01:11 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 12:01:11 2018 -0400 clips-executive: properly handle bools in robot memory Similar to symbols, we need to cast the value from robot memory to a symbol if it is a bool. http://git.fawkesrobotics.org/fawkes.git/commit/95a782c http://trac.fawkesrobotics.org/changeset/95a782c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* 95a782ccb5b178be938297f6e325109b4dab6918 - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 12:01:11 2018 -0400 Subject: clips-executive: properly handle bools in robot memory .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/wm-robmem-sync.clp b/src/plugins/clips-executive/clips/wm-robmem-sync.clp index 5a14ad8..4a7438d 100644 --- a/src/plugins/clips-executive/clips/wm-robmem-sync.clp +++ b/src/plugins/clips-executive/clips/wm-robmem-sync.clp @@ -112,7 +112,7 @@ (bind ?is-list (sym-cat (bson-get ?doc "is-list"))) (bind ?value (if (eq ?is-list TRUE) then nil else (bson-get ?doc "value"))) (bind ?values (if (eq ?is-list TRUE) then (bson-get-array ?doc "values") else (create$))) - (if (eq ?type SYMBOL) then + (if (or (eq ?type SYMBOL) (eq ?type BOOL)) then (bind ?value (sym-cat ?value)) (bind ?new-values (create$)) (foreach ?v ?values (bind ?new-values (append$ ?new-values (sym-cat ?v @@ -270,7 +270,7 @@ else (bind ?value (bson-get ?obj "o.value")) ) - (if (eq ?type SYMBOL) then + (if (or (eq ?type SYMBOL) (eq ?type BOOL)) then (bind ?value (sym-cat ?value)) (bind ?new-values (create$)) (foreach ?v ?values (bind ?new-values (append$ ?new-values (sym-cat ?v -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1423-g48269b8)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 48269b85d02459e1dd70de333f278630e1b8c4d4 (commit) via d851eca9d78bd53e17d6d9970cfb301cbe4d1035 (commit) from ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 48269b85d02459e1dd70de333f278630e1b8c4d4 Merge: ffb99ed d851eca Author: Till Hofmann AuthorDate: Sat Jun 16 20:09:19 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 20:09:19 2018 -0400 Merge remote-tracking branch 'origin/tviehmann/cx-mutex-op-feedback-cleanup' into current http://git.fawkesrobotics.org/fawkes.git/commit/48269b8 http://trac.fawkesrobotics.org/changeset/48269b8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 48269b85d02459e1dd70de333f278630e1b8c4d4 - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 20:09:19 2018 -0400 Subject: Merge remote-tracking branch 'origin/tviehmann/cx-mutex-op-feedback-cleanup' into current .../clips-executive/clips/coordination-mutex.clp |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/cx-wm-robmem-types: clips-executive: properly handle bools in robot memory
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/cx-wm-robmem-types has been updated discards 95a782ccb5b178be938297f6e325109b4dab6918 (commit) to 9c939c1d51c478bbdea3079609b90caeec1b83e3 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (95a782ccb5b178be938297f6e325109b4dab6918) \ N -- N -- N (9c939c1d51c478bbdea3079609b90caeec1b83e3) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/common/cx-wm-robmem-types Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 9c939c1d51c478bbdea3079609b90caeec1b83e3 Author: Till Hofmann AuthorDate: Sat Jun 16 12:01:11 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 12:04:58 2018 -0400 clips-executive: properly handle bools in robot memory Similar to symbols, we need to cast the value from robot memory to a symbol if it is a bool. Thanks to Daniel Habering for reporting and debugging this issue. http://git.fawkesrobotics.org/fawkes.git/commit/9c939c1 http://trac.fawkesrobotics.org/changeset/9c939c1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* 9c939c1d51c478bbdea3079609b90caeec1b83e3 - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 12:01:11 2018 -0400 Subject: clips-executive: properly handle bools in robot memory .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/wm-robmem-sync.clp b/src/plugins/clips-executive/clips/wm-robmem-sync.clp index 5a14ad8..4a7438d 100644 --- a/src/plugins/clips-executive/clips/wm-robmem-sync.clp +++ b/src/plugins/clips-executive/clips/wm-robmem-sync.clp @@ -112,7 +112,7 @@ (bind ?is-list (sym-cat (bson-get ?doc "is-list"))) (bind ?value (if (eq ?is-list TRUE) then nil else (bson-get ?doc "value"))) (bind ?values (if (eq ?is-list TRUE) then (bson-get-array ?doc "values") else (create$))) - (if (eq ?type SYMBOL) then + (if (or (eq ?type SYMBOL) (eq ?type BOOL)) then (bind ?value (sym-cat ?value)) (bind ?new-values (create$)) (foreach ?v ?values (bind ?new-values (append$ ?new-values (sym-cat ?v @@ -270,7 +270,7 @@ else (bind ?value (bson-get ?obj "o.value")) ) - (if (eq ?type SYMBOL) then + (if (or (eq ?type SYMBOL) (eq ?type BOOL)) then (bind ?value (sym-cat ?value)) (bind ?new-values (create$)) (foreach ?v ?values (bind ?new-values (append$ ?new-values (sym-cat ?v -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1421-gffb99ed)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated discards 067ae6fb44f29b2f03f046a2d021ef7082ecd2dd (commit) discards 95a782ccb5b178be938297f6e325109b4dab6918 (commit) to ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 (commit) via 9c939c1d51c478bbdea3079609b90caeec1b83e3 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (067ae6fb44f29b2f03f046a2d021ef7082ecd2dd) \ N -- N -- N (ffb99ed36db9fa704b609fb3587a52e1e83dfbc8) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 Merge: 0fa369c 9c939c1 Author: Till Hofmann AuthorDate: Sat Jun 16 12:05:37 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 12:05:37 2018 -0400 Merge remote-tracking branch 'origin/common/cx-wm-robmem-types' into current http://git.fawkesrobotics.org/fawkes.git/commit/ffb99ed http://trac.fawkesrobotics.org/changeset/ffb99ed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 12:05:37 2018 -0400 Subject: Merge remote-tracking branch 'origin/common/cx-wm-robmem-types' into current .../clips-executive/clips/wm-robmem-sync.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-debugging: created (1.0.1-1436-g689ec4c)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-debugging has been created
at 689ec4c4c53a401327198659064d8c4efecc63ad (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-debugging
- *Log* ---
commit 689ec4c4c53a401327198659064d8c4efecc63ad
Author: Till Hofmann
AuthorDate: Mon Jun 18 22:58:55 2018 -0400
Commit: Till Hofmann
CommitDate: Mon Jun 18 22:58:55 2018 -0400
robot-memory: add debugging messages
http://git.fawkesrobotics.org/fawkes.git/commit/689ec4c
http://trac.fawkesrobotics.org/changeset/689ec4c
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
- *Diffs* -
- *commit* 689ec4c4c53a401327198659064d8c4efecc63ad - - - - - - - - - -
Author: Till Hofmann
Date:Mon Jun 18 22:58:55 2018 -0400
Subject: robot-memory: add debugging messages
.../clips-executive/clips/coordination-mutex.clp |2 +-
.../clips_robot_memory_thread.cpp | 13 +
src/plugins/robot-memory/robot_memory.cpp | 19 ---
3 files changed, 30 insertions(+), 4 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp
b/src/plugins/clips-executive/clips/coordination-mutex.clp
index 3d8f526..19b332c 100644
--- a/src/plugins/clips-executive/clips/coordination-mutex.clp
+++ b/src/plugins/clips-executive/clips/coordination-mutex.clp
@@ -477,7 +477,7 @@
=>
(bind ?op (sym-cat (bson-get ?obj "op")))
- ;(printout warn "Trigger: " (bson-tostring ?obj) crlf)
+ (printout warn "Trigger: " (bson-tostring ?obj) crlf)
(switch ?op
(case i then (mutex-trigger-update ?obj))
(case u then (mutex-trigger-update ?obj))
diff --git a/src/plugins/clips-robot-memory/clips_robot_memory_thread.cpp
b/src/plugins/clips-robot-memory/clips_robot_memory_thread.cpp
index 4665fee..ba857b4 100644
--- a/src/plugins/clips-robot-memory/clips_robot_memory_thread.cpp
+++ b/src/plugins/clips-robot-memory/clips_robot_memory_thread.cpp
@@ -941,6 +941,9 @@
ClipsRobotMemoryThread::clips_robotmemory_mutex_try_lock_async(std::string env_n
if (! mutex_future_ready(name)) {
rv.push_back(CLIPS::Value("FALSE", CLIPS::TYPE_SYMBOL));
rv.push_back(CLIPS::Value("Task already running for "+name+"
(try-lock failed)"));
+printf("Before MutexLocker try_lock check\n");
+ MutexLocker lock(envs_[env_name].objmutex_ptr());
+printf("After MutexLocker try_lock check\n");
envs_[env_name]->assert_fact_f("(mutex-op-feedback
try-lock-async FAIL %s)",
name.c_str());
return rv;
@@ -950,7 +953,9 @@
ClipsRobotMemoryThread::clips_robotmemory_mutex_try_lock_async(std::string env_n
[this, env_name, name, identity] {
bool ok =
robot_memory->mutex_try_lock(name, identity);
if (! ok) {
+printf("Before MutexLocker try_lock async\n");
MutexLocker
lock(envs_[env_name].objmutex_ptr());
+printf("After MutexLocker try_lock async\n");
envs_[env_name]->assert_fact_f("(mutex-op-feedback try-lock-async FAIL %s)",
name.c_str());
}
@@ -971,7 +976,9 @@
ClipsRobotMemoryThread::clips_robotmemory_mutex_renew_lock_async(std::string env
if (! mutex_future_ready(name)) {
rv.push_back(CLIPS::Value("FALSE", CLIPS::TYPE_SYMBOL));
rv.push_back(CLIPS::Value("Task already running for "+name+"
(try-lock failed)"));
+ printf("Before MutexLocker renew_lock check\n");
MutexLocker lock(envs_[env_name].objmutex_ptr());
+ printf("After MutexLocker renew_lock check\n");
envs_[env_name]->assert_fact_f("(mutex-op-feedback
renew-lock-async FAIL %s)",
name.c_str());
return rv;
@@ -980,7 +987,9 @@
ClipsRobotMemoryThread::clips_robotmemory_mutex_renew_lock_async(std::string env
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1437-gc0be9e7)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to c0be9e79400155847ae1d38c90b8b37927e52a9f (commit) via 689ec4c4c53a401327198659064d8c4efecc63ad (commit) from dcd977d905eb13f82dda436dfbaebe0d5fd335c1 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit c0be9e79400155847ae1d38c90b8b37927e52a9f Merge: dcd977d 689ec4c Author: Till Hofmann AuthorDate: Mon Jun 18 23:01:23 2018 -0400 Commit: Till Hofmann CommitDate: Mon Jun 18 23:01:23 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-debugging' into current http://git.fawkesrobotics.org/fawkes.git/commit/c0be9e7 http://trac.fawkesrobotics.org/changeset/c0be9e7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp |2 +- .../clips_robot_memory_thread.cpp | 13 + src/plugins/robot-memory/robot_memory.cpp | 19 --- 3 files changed, 30 insertions(+), 4 deletions(-) - *Diffs* - - *commit* c0be9e79400155847ae1d38c90b8b37927e52a9f - - - - - - - - - - Author: Till Hofmann Date:Mon Jun 18 23:01:23 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-debugging' into current .../clips-executive/clips/coordination-mutex.clp |2 +- .../clips_robot_memory_thread.cpp | 13 + src/plugins/robot-memory/robot_memory.cpp | 19 --- 3 files changed, 30 insertions(+), 4 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-resources: clips-executive: print a warning if a resource lock was rejected
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated to 5b25356b171789ed473e4978e491a17ee36b4cfc (commit) from 817f10153f5adf75d2db7dfb8713c635a799667e (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 5b25356b171789ed473e4978e491a17ee36b4cfc Author: Till Hofmann AuthorDate: Wed Jun 13 13:55:27 2018 +0200 Commit: Till Hofmann CommitDate: Wed Jun 13 13:55:27 2018 +0200 clips-executive: print a warning if a resource lock was rejected http://git.fawkesrobotics.org/fawkes.git/commit/5b25356 http://trac.fawkesrobotics.org/changeset/5b25356 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 5b25356b171789ed473e4978e491a17ee36b4cfc - - - - - - - - - - Author: Till Hofmann Date:Wed Jun 13 13:55:27 2018 +0200 Subject: clips-executive: print a warning if a resource lock was rejected .../clips-executive/clips/resource-locks.clp |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index 1329894..0a877b4 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -55,6 +55,7 @@ and we have no pending requests, then we can directly reject the goal." (wm-fact (key cx identity) (value ?identity)) ?g <- (goal (mode COMMITTED) + (id ?goal-id) (acquired-resources) (required-resources $?req)) (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) @@ -62,6 +63,8 @@ (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) (request ~NONE))) => + (printout warn "Rejecting goal " ?goal-id ", " (mutex-to-resource ?n) + " is already locked by " ?locker crlf) (modify ?g (mode FINISHED) (outcome REJECTED)) ) @@ -102,6 +105,7 @@ "A lock was rejected and no resource is acquired anymore. Reject the goal." (mutex (name ?res) (request LOCK) (response REJECTED|ERROR) (error-msg ?err)) ?g <- (goal (mode COMMITTED) + (id ?goal-id) (required-resources $?req &:(member$ (mutex-to-resource ?res) ?req)) (acquired-resources)) @@ -111,6 +115,8 @@ (not (mutex (name ?ores&:(member$ (mutex-to-resource ?ores) ?req)) (response PENDING|ACQUIRED))) => + (printout warn "Rejecting goal " ?goal-id ", resource lock " + (mutex-to-resource ?res) " was rejected" crlf) (modify ?g (mode FINISHED) (outcome REJECTED) (message ?err)) (delayed-do-for-all-facts ((?om mutex)) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1417-g62f5636)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 62f56361c68f9b5811f69e0858c79fc94af1e9e5 (commit) via 5b25356b171789ed473e4978e491a17ee36b4cfc (commit) from 3e49e8ef038ed7b0e68c471a9e0ea56f69c1569d (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 62f56361c68f9b5811f69e0858c79fc94af1e9e5 Merge: 3e49e8e 5b25356 Author: Till Hofmann AuthorDate: Wed Jun 13 13:56:19 2018 +0200 Commit: Till Hofmann CommitDate: Wed Jun 13 13:56:19 2018 +0200 Merge remote-tracking branch 'origin/thofmann/clips-executive-resources' into current http://git.fawkesrobotics.org/fawkes.git/commit/62f5636 http://trac.fawkesrobotics.org/changeset/62f5636 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 62f56361c68f9b5811f69e0858c79fc94af1e9e5 - - - - - - - - - - Author: Till Hofmann Date:Wed Jun 13 13:56:19 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-resources' into current .../clips-executive/clips/resource-locks.clp |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-resources: clips-executive: try to lock resource if mutex state is UNKNOWN
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated to 159c644ec63999bf37a7727bd8ed1888da830c72 (commit) from 5b25356b171789ed473e4978e491a17ee36b4cfc (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 159c644ec63999bf37a7727bd8ed1888da830c72 Author: Till Hofmann AuthorDate: Wed Jun 13 15:05:16 2018 +0200 Commit: Till Hofmann CommitDate: Wed Jun 13 15:06:29 2018 +0200 clips-executive: try to lock resource if mutex state is UNKNOWN The only case where we should not try to lock the resource is if we know that the resource is locked. If it is unknown, we must try to lock the resource. http://git.fawkesrobotics.org/fawkes.git/commit/159c644 http://trac.fawkesrobotics.org/changeset/159c644 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 159c644ec63999bf37a7727bd8ed1888da830c72 - - - - - - - - - - Author: Till Hofmann Date:Wed Jun 13 15:05:16 2018 +0200 Subject: clips-executive: try to lock resource if mutex state is UNKNOWN .../clips-executive/clips/resource-locks.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index 0a877b4..b352c56 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -42,7 +42,7 @@ (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) (request ~NONE))) (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) - (state ~OPEN))) + (state LOCKED))) => (foreach ?res (set-diff ?req ?acq) (printout warn "Locking resource " ?res crlf) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1419-g0fa369c)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 0fa369ce9f2ec124e6c74de483cb25584daeacc7 (commit) via 159c644ec63999bf37a7727bd8ed1888da830c72 (commit) from 62f56361c68f9b5811f69e0858c79fc94af1e9e5 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 0fa369ce9f2ec124e6c74de483cb25584daeacc7 Merge: 62f5636 159c644 Author: Till Hofmann AuthorDate: Wed Jun 13 15:06:48 2018 +0200 Commit: Till Hofmann CommitDate: Wed Jun 13 15:06:48 2018 +0200 Merge remote-tracking branch 'origin/thofmann/clips-executive-resources' into current http://git.fawkesrobotics.org/fawkes.git/commit/0fa369c http://trac.fawkesrobotics.org/changeset/0fa369c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 0fa369ce9f2ec124e6c74de483cb25584daeacc7 - - - - - - - - - - Author: Till Hofmann Date:Wed Jun 13 15:06:48 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-resources' into current .../clips-executive/clips/resource-locks.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1425-g03c8aedf)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 03c8aedf84f677b3e4032414e91c938d0daa09b4 (commit) via b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a (commit) from 48269b85d02459e1dd70de333f278630e1b8c4d4 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 03c8aedf84f677b3e4032414e91c938d0daa09b4 Merge: 48269b8 b33c33f Author: Till Hofmann AuthorDate: Sat Jun 16 22:01:13 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 22:01:13 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current http://git.fawkesrobotics.org/fawkes.git/commit/03c8aedf http://trac.fawkesrobotics.org/changeset/03c8aedf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/robot-memory/event_trigger_manager.cpp | 16 ++-- 1 files changed, 10 insertions(+), 6 deletions(-) - *Diffs* - - *commit* 03c8aedf84f677b3e4032414e91c938d0daa09b4 - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 22:01:13 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current src/plugins/robot-memory/event_trigger_manager.cpp | 16 ++-- 1 files changed, 10 insertions(+), 6 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-fix-oplog-exception: robot-memory: catch an exception while reading the oplog
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-fix-oplog-exception has been updated
discards b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a (commit)
to 5b9b3d858eb13c3693941feeddf2c66856928b38 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a)
\
N -- N -- N (5b9b3d858eb13c3693941feeddf2c66856928b38)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-fix-oplog-exception
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 5b9b3d858eb13c3693941feeddf2c66856928b38
Author: Till Hofmann
AuthorDate: Sat Jun 16 22:00:27 2018 -0400
Commit: Till Hofmann
CommitDate: Sat Jun 16 22:02:07 2018 -0400
robot-memory: catch an exception while reading the oplog
http://git.fawkesrobotics.org/fawkes.git/commit/5b9b3d8
http://trac.fawkesrobotics.org/changeset/5b9b3d8
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/robot-memory/event_trigger_manager.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
- *Diffs* -
- *commit* 5b9b3d858eb13c3693941feeddf2c66856928b38 - - - - - - - - - -
Author: Till Hofmann
Date:Sat Jun 16 22:00:27 2018 -0400
Subject: robot-memory: catch an exception while reading the oplog
src/plugins/robot-memory/event_trigger_manager.cpp | 16 ++--
1 files changed, 10 insertions(+), 6 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/event_trigger_manager.cpp
b/src/plugins/robot-memory/event_trigger_manager.cpp
index 0d6dbda..a53245f 100644
--- a/src/plugins/robot-memory/event_trigger_manager.cpp
+++ b/src/plugins/robot-memory/event_trigger_manager.cpp
@@ -81,12 +81,16 @@ void EventTriggerManager::check_events()
for(EventTrigger *trigger : triggers)
{
-while(trigger->oplog_cursor->more())
-{
- BSONObj change = trigger->oplog_cursor->next();
- //logger_->log_info(name.c_str(), "Triggering: %s",
change.toString().c_str());
- //actually call the callback function
- trigger->callback(change);
+try {
+ while(trigger->oplog_cursor->more())
+ {
+BSONObj change = trigger->oplog_cursor->next();
+//logger_->log_info(name.c_str(), "Triggering: %s",
change.toString().c_str());
+//actually call the callback function
+trigger->callback(change);
+ }
+} catch (mongo::UserException ) {
+ logger_->log_error(name.c_str(), "Error while reading the oplog");
}
if(trigger->oplog_cursor->isDead())
{
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1425-g79b412e)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated discards 03c8aedf84f677b3e4032414e91c938d0daa09b4 (commit) discards b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a (commit) to 79b412eb5f8afd1ca5e0b8628bba95a3811268aa (commit) via 5b9b3d858eb13c3693941feeddf2c66856928b38 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (03c8aedf84f677b3e4032414e91c938d0daa09b4) \ N -- N -- N (79b412eb5f8afd1ca5e0b8628bba95a3811268aa) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 79b412eb5f8afd1ca5e0b8628bba95a3811268aa Merge: 48269b8 5b9b3d8 Author: Till Hofmann AuthorDate: Sat Jun 16 22:02:29 2018 -0400 Commit: Till Hofmann CommitDate: Sat Jun 16 22:02:29 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current http://git.fawkesrobotics.org/fawkes.git/commit/79b412e http://trac.fawkesrobotics.org/changeset/79b412e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/robot-memory/event_trigger_manager.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 79b412eb5f8afd1ca5e0b8628bba95a3811268aa - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 16 22:02:29 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current src/plugins/robot-memory/event_trigger_manager.cpp | 16 ++-- 1 files changed, 10 insertions(+), 6 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-fix-oplog-exception: created (1.0.1-1336-gb33c33f)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-fix-oplog-exception has been created
at b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-fix-oplog-exception
- *Log* ---
commit b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a
Author: Till Hofmann
AuthorDate: Sat Jun 16 22:00:27 2018 -0400
Commit: Till Hofmann
CommitDate: Sat Jun 16 22:00:27 2018 -0400
robot-memory: catch an exception while reading the oplog
http://git.fawkesrobotics.org/fawkes.git/commit/b33c33f
http://trac.fawkesrobotics.org/changeset/b33c33f
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
- *Diffs* -
- *commit* b33c33fd42f7bd90a0ccb5a0ac51350204a2ea1a - - - - - - - - - -
Author: Till Hofmann
Date:Sat Jun 16 22:00:27 2018 -0400
Subject: robot-memory: catch an exception while reading the oplog
src/plugins/robot-memory/event_trigger_manager.cpp | 16 ++--
1 files changed, 10 insertions(+), 6 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/event_trigger_manager.cpp
b/src/plugins/robot-memory/event_trigger_manager.cpp
index 0d6dbda..8bb759f 100644
--- a/src/plugins/robot-memory/event_trigger_manager.cpp
+++ b/src/plugins/robot-memory/event_trigger_manager.cpp
@@ -81,12 +81,16 @@ void EventTriggerManager::check_events()
for(EventTrigger *trigger : triggers)
{
-while(trigger->oplog_cursor->more())
-{
- BSONObj change = trigger->oplog_cursor->next();
- //logger_->log_info(name.c_str(), "Triggering: %s",
change.toString().c_str());
- //actually call the callback function
- trigger->callback(change);
+try {
+ while(trigger->oplog_cursor->more())
+ {
+BSONObj change = trigger->oplog_cursor->next();
+//logger_->log_info(name.c_str(), "Triggering: %s",
change.toString().c_str());
+//actually call the callback function
+trigger->callback(change);
+ }
+} catch (mongo::UserException ) {
+ logger_->log_error(name().c_str(), "Error while reading the oplog");
}
if(trigger->oplog_cursor->isDead())
{
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1427-gd91386c)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to d91386c1d8768e5d6987918a92c9e52b080e75d6 (commit) via 6b4aa1b92d48750bffe875409c0474ae47222698 (commit) from 79b412eb5f8afd1ca5e0b8628bba95a3811268aa (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit d91386c1d8768e5d6987918a92c9e52b080e75d6 Merge: 79b412e 6b4aa1b Author: Till Hofmann AuthorDate: Sun Jun 17 12:01:37 2018 -0400 Commit: Till Hofmann CommitDate: Sun Jun 17 12:01:37 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current http://git.fawkesrobotics.org/fawkes.git/commit/d91386c http://trac.fawkesrobotics.org/changeset/d91386c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/robot-memory/event_trigger_manager.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* d91386c1d8768e5d6987918a92c9e52b080e75d6 - - - - - - - - - - Author: Till Hofmann Date:Sun Jun 17 12:01:37 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current src/plugins/robot-memory/event_trigger_manager.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-fix-oplog-exception: fixup! robot-memory: catch an exception while reading the oplog
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-fix-oplog-exception has been updated
to 6b4aa1b92d48750bffe875409c0474ae47222698 (commit)
from 5b9b3d858eb13c3693941feeddf2c66856928b38 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-fix-oplog-exception
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 6b4aa1b92d48750bffe875409c0474ae47222698
Author: Till Hofmann
AuthorDate: Sun Jun 17 11:55:35 2018 -0400
Commit: Till Hofmann
CommitDate: Sun Jun 17 11:55:35 2018 -0400
fixup! robot-memory: catch an exception while reading the oplog
http://git.fawkesrobotics.org/fawkes.git/commit/6b4aa1b
http://trac.fawkesrobotics.org/changeset/6b4aa1b
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/robot-memory/event_trigger_manager.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
- *Diffs* -
- *commit* 6b4aa1b92d48750bffe875409c0474ae47222698 - - - - - - - - - -
Author: Till Hofmann
Date:Sun Jun 17 11:55:35 2018 -0400
Subject: fixup! robot-memory: catch an exception while reading the oplog
src/plugins/robot-memory/event_trigger_manager.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/event_trigger_manager.cpp
b/src/plugins/robot-memory/event_trigger_manager.cpp
index a53245f..6860ed7 100644
--- a/src/plugins/robot-memory/event_trigger_manager.cpp
+++ b/src/plugins/robot-memory/event_trigger_manager.cpp
@@ -89,7 +89,7 @@ void EventTriggerManager::check_events()
//actually call the callback function
trigger->callback(change);
}
-} catch (mongo::UserException ) {
+} catch (mongo::DBException ) {
logger_->log_error(name.c_str(), "Error while reading the oplog");
}
if(trigger->oplog_cursor->isDead())
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1433-g9f9e18e)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 9f9e18e620b6272d31b2c5895df469a832bcd72f (commit) via 5fb809742a0528ddec3d1baaee89f1691245c0f1 (commit) from 106d821590b326c9dbad2f339d27acf322e2983b (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 9f9e18e620b6272d31b2c5895df469a832bcd72f Merge: 106d821 5fb8097 Author: Till Hofmann AuthorDate: Sun Jun 17 20:23:33 2018 -0400 Commit: Till Hofmann CommitDate: Sun Jun 17 20:23:33 2018 -0400 Merge remote-tracking branch 'origin/nlimpert/ros_navigator_generic_vel_conf' into current http://git.fawkesrobotics.org/fawkes.git/commit/9f9e18e http://trac.fawkesrobotics.org/changeset/9f9e18e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/ros/navigator_thread.cpp | 13 + src/plugins/ros/navigator_thread.h |3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) - *Diffs* - - *commit* 9f9e18e620b6272d31b2c5895df469a832bcd72f - - - - - - - - - - Author: Till Hofmann Date:Sun Jun 17 20:23:33 2018 -0400 Subject: Merge remote-tracking branch 'origin/nlimpert/ros_navigator_generic_vel_conf' into current src/plugins/ros/navigator_thread.cpp | 13 + src/plugins/ros/navigator_thread.h |3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-fix-oplog-exception: robot-memory: if try-lock throws an exception, check if we got the mutex
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-fix-oplog-exception has been updated
to de293be5287d7c43d65bd9f8199b3f76c4d23fa8 (commit)
from 6b4aa1b92d48750bffe875409c0474ae47222698 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-fix-oplog-exception
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit de293be5287d7c43d65bd9f8199b3f76c4d23fa8
Author: Till Hofmann
AuthorDate: Sun Jun 17 16:48:23 2018 -0400
Commit: Till Hofmann
CommitDate: Sun Jun 17 16:48:23 2018 -0400
robot-memory: if try-lock throws an exception, check if we got the mutex
Sometimes, a MongoDB exception is thrown, but we still acquired the
mutex. To detect this case, try to check the database whether we
acquired the mutex, and if we did, let the try-lock succeed. Otherwise,
or if there is another exception, return false and report an error.
http://git.fawkesrobotics.org/fawkes.git/commit/de293be
http://trac.fawkesrobotics.org/changeset/de293be
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/robot-memory/robot_memory.cpp | 28 +---
1 files changed, 25 insertions(+), 3 deletions(-)
- *Diffs* -
- *commit* de293be5287d7c43d65bd9f8199b3f76c4d23fa8 - - - - - - - - - -
Author: Till Hofmann
Date:Sun Jun 17 16:48:23 2018 -0400
Subject: robot-memory: if try-lock throws an exception, check if we got the
mutex
src/plugins/robot-memory/robot_memory.cpp | 28 +---
1 files changed, 25 insertions(+), 3 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/robot_memory.cpp
b/src/plugins/robot-memory/robot_memory.cpp
index 37d48f0..f696a09 100644
--- a/src/plugins/robot-memory/robot_memory.cpp
+++ b/src/plugins/robot-memory/robot_memory.cpp
@@ -877,9 +877,31 @@ RobotMemory::mutex_try_lock(const std::string& name,
new_doc.getField("locked").Bool());
} catch (mongo::OperationException ) {
- //if (e.obj()["code"].numberInt() != 11000) {
- // 11000: Duplicate key exception, occurs if we do not become
leader, all fine
- return false;
+logger_->log_error(name_, "Mongo OperationException: %s", e.what());
+try {
+ mongo::BSONObjBuilder check_doc;
+ check_doc.append("_id", name);
+ check_doc.append("locked", true);
+ check_doc.append("locked-by", identity);
+ BSONObj res_doc =
+client->findOne(cfg_coord_mutex_collection_, check_doc.obj());
+ logger_->log_info(name_, "Checking whether mutex was acquired
succeeded");
+ if (!res_doc.isEmpty()) {
+logger_->log_warn(name_,
+"Exception during try-lock for %s, but mutex was still acquired",
+name.c_str());
+ } else {
+logger_->log_info(name_,
+"Exception during try-lock for %s, and mutex was not acquired",
+name.c_str());
+ }
+ return !res_doc.isEmpty();
+} catch (mongo::OperationException ) {
+ logger_->log_error(name_,
+"Mongo OperationException while handling the first exception: %s",
+e.what());
+ return false;
+}
}
}
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-fix-oplog-exception: robot-memory: if try-lock throws an exception, check if we got the mutex
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-fix-oplog-exception has been updated
discards de293be5287d7c43d65bd9f8199b3f76c4d23fa8 (commit)
to 7388efe2160fc56d872ef84b4e231dc63b0b19da (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (de293be5287d7c43d65bd9f8199b3f76c4d23fa8)
\
N -- N -- N (7388efe2160fc56d872ef84b4e231dc63b0b19da)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-fix-oplog-exception
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 7388efe2160fc56d872ef84b4e231dc63b0b19da
Author: Till Hofmann
AuthorDate: Sun Jun 17 16:48:23 2018 -0400
Commit: Till Hofmann
CommitDate: Sun Jun 17 16:50:13 2018 -0400
robot-memory: if try-lock throws an exception, check if we got the mutex
Sometimes, a MongoDB exception is thrown, but we still acquired the
mutex. To detect this case, try to check the database whether we
acquired the mutex, and if we did, let the try-lock succeed. Otherwise,
or if there is another exception, return false and report an error.
Thanks to Daniel Habering for debugging and suggestions on the error
handling.
http://git.fawkesrobotics.org/fawkes.git/commit/7388efe
http://trac.fawkesrobotics.org/changeset/7388efe
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
- *Diffs* -
- *commit* 7388efe2160fc56d872ef84b4e231dc63b0b19da - - - - - - - - - -
Author: Till Hofmann
Date:Sun Jun 17 16:48:23 2018 -0400
Subject: robot-memory: if try-lock throws an exception, check if we got the
mutex
src/plugins/robot-memory/robot_memory.cpp | 28 +---
1 files changed, 25 insertions(+), 3 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/robot_memory.cpp
b/src/plugins/robot-memory/robot_memory.cpp
index 37d48f0..f696a09 100644
--- a/src/plugins/robot-memory/robot_memory.cpp
+++ b/src/plugins/robot-memory/robot_memory.cpp
@@ -877,9 +877,31 @@ RobotMemory::mutex_try_lock(const std::string& name,
new_doc.getField("locked").Bool());
} catch (mongo::OperationException ) {
- //if (e.obj()["code"].numberInt() != 11000) {
- // 11000: Duplicate key exception, occurs if we do not become
leader, all fine
- return false;
+logger_->log_error(name_, "Mongo OperationException: %s", e.what());
+try {
+ mongo::BSONObjBuilder check_doc;
+ check_doc.append("_id", name);
+ check_doc.append("locked", true);
+ check_doc.append("locked-by", identity);
+ BSONObj res_doc =
+client->findOne(cfg_coord_mutex_collection_, check_doc.obj());
+ logger_->log_info(name_, "Checking whether mutex was acquired
succeeded");
+ if (!res_doc.isEmpty()) {
+logger_->log_warn(name_,
+"Exception during try-lock for %s, but mutex was still acquired",
+name.c_str());
+ } else {
+logger_->log_info(name_,
+"Exception during try-lock for %s, and mutex was not acquired",
+name.c_str());
+ }
+ return !res_doc.isEmpty();
+} catch (mongo::OperationException ) {
+ logger_->log_error(name_,
+"Mongo OperationException while handling the first exception: %s",
+e.what());
+ return false;
+}
}
}
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1431-g106d821)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 106d821590b326c9dbad2f339d27acf322e2983b (commit) via 7388efe2160fc56d872ef84b4e231dc63b0b19da (commit) from 5f467edc5105ee3c8730c69e6d986c14d26ab699 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 106d821590b326c9dbad2f339d27acf322e2983b Merge: 5f467ed 7388efe Author: Till Hofmann AuthorDate: Sun Jun 17 16:50:52 2018 -0400 Commit: Till Hofmann CommitDate: Sun Jun 17 16:50:52 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current http://git.fawkesrobotics.org/fawkes.git/commit/106d821 http://trac.fawkesrobotics.org/changeset/106d821 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/robot-memory/robot_memory.cpp | 28 +--- 1 files changed, 25 insertions(+), 3 deletions(-) - *Diffs* - - *commit* 106d821590b326c9dbad2f339d27acf322e2983b - - - - - - - - - - Author: Till Hofmann Date:Sun Jun 17 16:50:52 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-fix-oplog-exception' into current src/plugins/robot-memory/robot_memory.cpp | 28 +--- 1 files changed, 25 insertions(+), 3 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/cx-use-systime-for-locking: created (1.0.1-1336-g7ebe94a)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/cx-use-systime-for-locking has been created at 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/cx-use-systime-for-locking - *Log* --- commit 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 Author: Till Hofmann AuthorDate: Sun Jun 17 16:07:55 2018 -0400 Commit: Till Hofmann CommitDate: Sun Jun 17 16:07:55 2018 -0400 clips-executive: use truncated systime when checking lock expiration The timestamp comes from the database, thus use the systime to check whether the lock has expired. http://git.fawkesrobotics.org/fawkes.git/commit/7ebe94a http://trac.fawkesrobotics.org/changeset/7ebe94a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 - - - - - - - - - - Author: Till Hofmann Date:Sun Jun 17 16:07:55 2018 -0400 Subject: clips-executive: use truncated systime when checking lock expiration .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp b/src/plugins/clips-executive/clips/coordination-mutex.clp index 26df003..5e458a4 100644 --- a/src/plugins/clips-executive/clips/coordination-mutex.clp +++ b/src/plugins/clips-executive/clips/coordination-mutex.clp @@ -365,7 +365,7 @@ (wm-fact (id "/config/coordination/mutex/renew-interval") (type FLOAT|UINT|INT) (value ?renew-interval)) ?mf <- (mutex (name ?name) (state LOCKED) (request NONE) (pending-requests) (locked-by ?lb&:(eq ?lb (cx-identity))) - (lock-time $?lt&:(timeout ?now ?lt ?renew-interval))) + (lock-time $?lt&:(timeout (time-trunc-ms (now-systime)) ?lt ?renew-interval))) => (printout t "Automatic renewal of lock for mutex " ?name crlf) (modify ?mf (request RENEW-LOCK) (response NONE) (pending-requests AUTO-RENEW-PROC)) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/cx-use-systime-for-locking: created (1.0.1-1336-g7ebe94a)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, cx-use-systime-for-locking has been created at 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 (commit) http://git.fawkesrobotics.org/fawkes.git/cx-use-systime-for-locking - *Log* --- commit 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 Author: Till Hofmann AuthorDate: Sun Jun 17 16:07:55 2018 -0400 Commit: Till Hofmann CommitDate: Sun Jun 17 16:07:55 2018 -0400 clips-executive: use truncated systime when checking lock expiration The timestamp comes from the database, thus use the systime to check whether the lock has expired. http://git.fawkesrobotics.org/fawkes.git/commit/7ebe94a http://trac.fawkesrobotics.org/changeset/7ebe94a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 - - - - - - - - - - Author: Till Hofmann Date:Sun Jun 17 16:07:55 2018 -0400 Subject: clips-executive: use truncated systime when checking lock expiration .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp b/src/plugins/clips-executive/clips/coordination-mutex.clp index 26df003..5e458a4 100644 --- a/src/plugins/clips-executive/clips/coordination-mutex.clp +++ b/src/plugins/clips-executive/clips/coordination-mutex.clp @@ -365,7 +365,7 @@ (wm-fact (id "/config/coordination/mutex/renew-interval") (type FLOAT|UINT|INT) (value ?renew-interval)) ?mf <- (mutex (name ?name) (state LOCKED) (request NONE) (pending-requests) (locked-by ?lb&:(eq ?lb (cx-identity))) - (lock-time $?lt&:(timeout ?now ?lt ?renew-interval))) + (lock-time $?lt&:(timeout (time-trunc-ms (now-systime)) ?lt ?renew-interval))) => (printout t "Automatic renewal of lock for mutex " ?name crlf) (modify ?mf (request RENEW-LOCK) (response NONE) (pending-requests AUTO-RENEW-PROC)) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1429-g5f467ed)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 5f467edc5105ee3c8730c69e6d986c14d26ab699 (commit) via 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 (commit) from d91386c1d8768e5d6987918a92c9e52b080e75d6 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 5f467edc5105ee3c8730c69e6d986c14d26ab699 Merge: d91386c 7ebe94a Author: Till Hofmann AuthorDate: Sun Jun 17 16:10:36 2018 -0400 Commit: Till Hofmann CommitDate: Sun Jun 17 16:10:36 2018 -0400 Merge remote-tracking branch 'origin/thofmann/cx-use-systime-for-locking' into current http://git.fawkesrobotics.org/fawkes.git/commit/5f467ed http://trac.fawkesrobotics.org/changeset/5f467ed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 5f467edc5105ee3c8730c69e6d986c14d26ab699 - - - - - - - - - - Author: Till Hofmann Date:Sun Jun 17 16:10:36 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/cx-use-systime-for-locking' into current .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/cx-use-systime-for-locking: deleted (1.0.1-1336-g7ebe94a)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, cx-use-systime-for-locking has been deleted was 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 7ebe94a84ae32eb21ddae4dc5c1f745d2cba2776 clips-executive: use truncated systime when checking lock expiration -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-lock-thread-safety: created (1.0.1-1434-gde94b71)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-lock-thread-safety has been created
at de94b71d5d66187eb91e3b0a4362e494423f5f74 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-lock-thread-safety
- *Log* ---
commit de94b71d5d66187eb91e3b0a4362e494423f5f74
Author: Till Hofmann
AuthorDate: Mon Jun 18 01:05:07 2018 -0400
Commit: Till Hofmann
CommitDate: Mon Jun 18 01:05:07 2018 -0400
robot memory: guard all lock queries with the robot memory mutex
The mongo-cxx-driver is not thread-safe. Therefore, add mutexes to all
mongo queries to ensure that we never query in multiple threads at once.
http://git.fawkesrobotics.org/fawkes.git/commit/de94b71
http://trac.fawkesrobotics.org/changeset/de94b71
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
- *Diffs* -
- *commit* de94b71d5d66187eb91e3b0a4362e494423f5f74 - - - - - - - - - -
Author: Till Hofmann
Date:Mon Jun 18 01:05:07 2018 -0400
Subject: robot memory: guard all lock queries with the robot memory mutex
src/plugins/robot-memory/robot_memory.cpp |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/robot_memory.cpp
b/src/plugins/robot-memory/robot_memory.cpp
index e9592ac..d73a883 100644
--- a/src/plugins/robot-memory/robot_memory.cpp
+++ b/src/plugins/robot-memory/robot_memory.cpp
@@ -866,6 +866,7 @@ RobotMemory::mutex_try_lock(const std::string& name,
update_doc.append("$set", update_set.obj());
try {
+ MutexLocker locker(mutex_);
BSONObj new_doc =
client->findAndModify(cfg_coord_mutex_collection_,
filter_doc.obj(),
update_doc.obj(),
@@ -883,6 +884,7 @@ RobotMemory::mutex_try_lock(const std::string& name,
check_doc.append("_id", name);
check_doc.append("locked", true);
check_doc.append("locked-by", identity);
+ MutexLocker locker(mutex_);
BSONObj res_doc =
client->findOne(cfg_coord_mutex_collection_, check_doc.obj());
logger_->log_info(name_, "Checking whether mutex was acquired
succeeded");
@@ -946,6 +948,7 @@ RobotMemory::mutex_unlock(const std::string& name,
"lock-time" << true))};
try {
+ MutexLocker locker(mutex_);
BSONObj new_doc =
client->findAndModify(cfg_coord_mutex_collection_,
filter_doc, update_doc,
@@ -996,6 +999,7 @@ RobotMemory::mutex_renew_lock(const std::string& name,
update_doc.append("$set", update_set.obj());
try {
+ MutexLocker locker(mutex_);
BSONObj new_doc =
client->findAndModify(cfg_coord_mutex_collection_,
filter_doc, update_doc.obj(),
@@ -1077,6 +1081,7 @@ RobotMemory::mutex_expire_locks(float max_age_sec)
update_doc.append("$set", update_set.obj());
try {
+ MutexLocker locker(mutex_);
client->update(cfg_coord_mutex_collection_, filter_doc,
update_doc.obj(),
/* upsert */ false, /* multi */ true,
::WriteConcern::majority);
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1435-gdcd977d)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to dcd977d905eb13f82dda436dfbaebe0d5fd335c1 (commit) via de94b71d5d66187eb91e3b0a4362e494423f5f74 (commit) from 9f9e18e620b6272d31b2c5895df469a832bcd72f (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit dcd977d905eb13f82dda436dfbaebe0d5fd335c1 Merge: 9f9e18e de94b71 Author: Till Hofmann AuthorDate: Mon Jun 18 01:07:31 2018 -0400 Commit: Till Hofmann CommitDate: Mon Jun 18 01:07:31 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-lock-thread-safety' into current http://git.fawkesrobotics.org/fawkes.git/commit/dcd977d http://trac.fawkesrobotics.org/changeset/dcd977d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/robot-memory/robot_memory.cpp |5 + 1 files changed, 5 insertions(+), 0 deletions(-) - *Diffs* - - *commit* dcd977d905eb13f82dda436dfbaebe0d5fd335c1 - - - - - - - - - - Author: Till Hofmann Date:Mon Jun 18 01:07:31 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-lock-thread-safety' into current src/plugins/robot-memory/robot_memory.cpp |5 + 1 files changed, 5 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-renewal-succeeded-but-lock-expired: clips-executive: deal with renewed but expired locks
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/robot-memory-renewal-succeeded-but-lock-expired has been updated discards 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 (commit) to cb63e11a76d931bd1d47e0e8614ccf2b6a32173b (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9) \ N -- N -- N (cb63e11a76d931bd1d47e0e8614ccf2b6a32173b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-renewal-succeeded-but-lock-expired Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit cb63e11a76d931bd1d47e0e8614ccf2b6a32173b Author: Till Hofmann AuthorDate: Tue Jun 19 01:11:37 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 13:07:20 2018 -0400 clips-executive: deal with renewed but expired locks For some reason, a lock renewal request can succeed (response ACQUIRED), but the lock has already been expired and is OPEN. In this case, ignore the response and treat the lock as if it was lost. http://git.fawkesrobotics.org/fawkes.git/commit/cb63e11 http://trac.fawkesrobotics.org/changeset/cb63e11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* cb63e11a76d931bd1d47e0e8614ccf2b6a32173b - - - - - - - - - - Author: Till Hofmann Date:Tue Jun 19 01:11:37 2018 -0400 Subject: clips-executive: deal with renewed but expired locks .../clips-executive/clips/coordination-mutex.clp | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp b/src/plugins/clips-executive/clips/coordination-mutex.clp index 19b332c..50a5009 100644 --- a/src/plugins/clips-executive/clips/coordination-mutex.clp +++ b/src/plugins/clips-executive/clips/coordination-mutex.clp @@ -387,6 +387,16 @@ (modify ?mf (request NONE) (response NONE) (pending-requests ?pending-requests)) ) +(defrule mutex-lock-auto-renew-done-but-lock-open + ?mf <- (mutex (name ?name) (state OPEN) + (request RENEW-LOCK) (response ACQUIRED) + (pending-requests AUTO-RENEW-PROC $?pending-requests)) + => + (printout error "Renewed " ?name " but lock has expired in the meantime. " + "LOST LOCK!" crlf) + (modify ?mf (request NONE) (response NONE) (pending-requests ?pending-requests)) +) + (defrule mutex-lock-auto-renew-failed ?mf <- (mutex (name ?name) (state LOCKED) (request RENEW-LOCK) (response REJECTED) (locked-by ?lb) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1439-ga50d85f)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated discards 633d043c83d4d94537e175c0c7391f9d97f1e49a (commit) discards 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 (commit) to a50d85f1c3ba7403ba3616e8c473c13ecab84f4d (commit) via cb63e11a76d931bd1d47e0e8614ccf2b6a32173b (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (633d043c83d4d94537e175c0c7391f9d97f1e49a) \ N -- N -- N (a50d85f1c3ba7403ba3616e8c473c13ecab84f4d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit a50d85f1c3ba7403ba3616e8c473c13ecab84f4d Merge: c0be9e7 cb63e11 Author: Till Hofmann AuthorDate: Tue Jun 19 13:08:11 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 13:08:11 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-renewal-succeeded-but-lock-expired' into current http://git.fawkesrobotics.org/fawkes.git/commit/a50d85f http://trac.fawkesrobotics.org/changeset/a50d85f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* a50d85f1c3ba7403ba3616e8c473c13ecab84f4d - - - - - - - - - - Author: Till Hofmann Date:Tue Jun 19 13:08:11 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-renewal-succeeded-but-lock-expired' into current .../clips-executive/clips/coordination-mutex.clp | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/cx-domain-activation-ordering: 118 revs updated. (1.0.1-925-gb30e02e)
via b1a813e4a484eccf737f66b8627aa981297f42f6 (commit) via aab726a4f69ead23976ab95fe8fab3e3922a3853 (commit) via ec261757ea98e18799c5ee83f9fddd8d558603c6 (commit) via 6965503955871a46ed5f0beeb65a81a434db800a (commit) via 6e71290df557a20d8b736a56aed7fa3338b2c9fc (commit) via 8a32ddf7d62dde3170763aa2af6376b8edb1826b (commit) via 80e73adca53998c3f5c8f0a234641aaeeb888321 (commit) via da7cca623419f1ea6d869c6d69ec0cf07e1843c6 (commit) via b9cac4245ef5b0657b97724533078f1d1dacc88a (commit) via b3f92d149c7647699c3700be5a7e57916ba792f9 (commit) via a808ad7b8e6f519026c976ceeed62a3a7a491b4b (commit) via a9ee2f8f8c95a5cb235dd1ea59144aacda544b44 (commit) via c7b8192d34d8fb535d6ec50db5e406da0f1dc636 (commit) via 76780e15859e86e68550cfe039e357323b9e6450 (commit) via afd52c4457464958090d7198825ccf8bf0789501 (commit) via 3570aa47e01c4a1ed16cc0f06c77df2702e6d51e (commit) via d11c0d4bf9c8a0c025e925f24b6bc9b34d72de9d (commit) via b543f6488d88900cc38e5d44b979c4c750134637 (commit) via 9707f1e30027b8984281ccb086896154c0d8659c (commit) via 6cc2485eaa99b4f9dc415ea7fe518fbe58a7 (commit) via ba10c1c2e01dc2ec0f3e1f8cc95760ff21139c0f (commit) via 4cd32979355298cba581ecf71d9e4053d5b4c666 (commit) via 2ff5fcfdbbf796f6cb7ee1aadbca27101e8d510c (commit) via 391895963d721856bab9cb14bca02756fc68d2e9 (commit) via fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee (commit) via a6bce362c09c8065a8df06cdd65d72f33594eb5c (commit) via d4f1c0757a8d005c6b823254408bc36f7eb0e328 (commit) via c7377326ecc199de24aab7826123996c4cbd040e (commit) via b59de4732dea67eb7422e70ca6ec41c340be498c (commit) via 9bf15efa4dcaa9868ca11f41a01d5992d987bed6 (commit) via 89d4ede0c4ecddc19c25c6d347290026fa539bc8 (commit) via 83e3fc965eaa5ecd37fa659eb566d7c59b9298c0 (commit) via 02408505413a31baeb56aaa0a12c737bf2c4a3a7 (commit) via bc228d1d61941105ab50c0c7a3c1254fded95941 (commit) via 09c0997c795dff2c60776a605c720490108fa066 (commit) via 59b5315040c93d625d26a5d41b85c354f63bcd23 (commit) via 5c2587e061f18e14a8fa54c3ce00c79ec297bfa2 (commit) via 4ae930a09605e6562892d646f9f2a2ee3403f0da (commit) via 58193e4728bcab0f7426a7d43c7f7738302c63ea (commit) via 0525a778d3891913aa10939e86578431e90bad64 (commit) via fab402429cd7487379d863e10b3f82af3da18ed4 (commit) via 34514ff1bab724a11041513348b8c8a519fefb5f (commit) via 99233b0fb0b694f3d478dec10c0d6b0758cc5f93 (commit) via cfb219ab36fc8dcc1565bcaa1dc7f441d35252a0 (commit) via d46201cdad0c1885af55f8f0faa7a1fc0b8cc2a8 (commit) via d43529416c07e5fad0096ade4113ec9de9296d12 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (427b4dd417ee07a956a6dc2933e41d97d6c37eb6) \ N -- N -- N (b30e02ef8a366037f6e2a5ce997c92d8af629e7a) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/cx-domain-activation-ordering Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit e5e4fa161411158093a18e12b87fcd14d3b7ed4a Author: Till Hofmann AuthorDate: Tue Apr 24 15:31:13 2018 +0200 Commit: Till Hofmann CommitDate: Tue May 29 14:27:51 2018 +0200 clips-executive: remove all ground preconditions atomically Instead of asserting domain-wm-update and retracting all preconditions one by one, move the retraction into a function and retract all ground preconditions in one function call. http://git.fawkesrobotics.org/fawkes.git/commit/e5e4fa1 http://trac.fawkesrobotics.org/changeset/e5e4fa1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7b0ab45e30c779a0c562295fc44e4c7dc0e53847 Author: Till Hofmann AuthorDate: Tue Apr 24 16:06:01 2018 +0200 Commit: Till Hofmann CommitDate: Tue May 29 14:28:44 2018 +0200 clips-executive: also check if an atomic precondition is not satisfied We only checked that an atomic precondition is satisfied. We also need to check if it is currently marked as satisfied but no corresponding domain fact exists. http://git.fawkesrobotics.org/fawkes.git/commit/7b0ab45 http://trac.fawkesrobotics.org/changeset/7b0ab45 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b30e02ef8a366037f6e2a5ce997c92d8af629
[Fawkes Git] branch/common/current-clips-executive-pddl: deleted (1.0.1-671-g1ee0ab3)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-pddl has been deleted was 1ee0ab3855a7f86e86071d27b510df0fbc114042 1ee0ab3855a7f86e86071d27b510df0fbc114042 Merge remote-tracking branch 'origin/thofmann/tf-fix-faulty-bullet-optimization' into current-clips-executive-pddl -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive: deleted (1.0.1-471-g98b2960)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive has been deleted was 98b2960592e0aa45722a22827c056b526cc17183 98b2960592e0aa45722a22827c056b526cc17183 clips executive: load pddl feature on startup -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/master: config: replace mongodb host palomino by localhost
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, master has been updated to cf2d0cc1f4cfb1b459c19cffc0b99ab71f02adc4 (commit) from 80b94c09d3d73ae3f66426a906cf2630f2aa64ab (commit) http://git.fawkesrobotics.org/fawkes.git/master Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit cf2d0cc1f4cfb1b459c19cffc0b99ab71f02adc4 Author: Till Hofmann AuthorDate: Thu May 31 19:03:28 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 19:03:28 2018 +0200 config: replace mongodb host palomino by localhost This is a test config, it should always use localhost. http://git.fawkesrobotics.org/fawkes.git/commit/cf2d0cc http://trac.fawkesrobotics.org/changeset/cf2d0cc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- cfg/conf.d/mongodb.yaml | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) - *Diffs* - - *commit* cf2d0cc1f4cfb1b459c19cffc0b99ab71f02adc4 - - - - - - - - - - Author: Till Hofmann Date:Thu May 31 19:03:28 2018 +0200 Subject: config: replace mongodb host palomino by localhost cfg/conf.d/mongodb.yaml | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) _Diff for modified files_: diff --git a/cfg/conf.d/mongodb.yaml b/cfg/conf.d/mongodb.yaml index 046e792..eb4205f 100644 --- a/cfg/conf.d/mongodb.yaml +++ b/cfg/conf.d/mongodb.yaml @@ -22,31 +22,31 @@ plugins/mongodb: name: rs0 hosts: - localhost:27021 -- localhost:27021 +- localhost:27022 robot-memory-local-direct: enabled: true mode: connection - hostport: palomino:27021 + hostport: localhost:27021 robot-memory-local: enabled: true mode: replica_set name: robot-memory-local hosts: -- palomino:27021 +- localhost:27021 robot-memory-distributed-direct: enabled: true mode: connection - hostport: palomino:27022 + hostport: localhost:27022 robot-memory-distributed: enabled: true mode: replica_set name: robot-memory-distributed hosts: -- palomino:27022 +- localhost:27022 # The following defines the mongod instances you want # the mongodb plugin to run @@ -112,17 +112,17 @@ plugins/mongodb: enabled: false local-client: rs0-local hosts: - - palomino:27021 - - palomino:27022 + - localhost:27021 + - localhost:27022 robot-memory-local: enabled: true local-client: robot-memory-local-direct hosts: - - palomino:27021 + - localhost:27021 robot-memory-distributed: enabled: true local-client: robot-memory-distributed-direct hosts: - - palomino:27022 + - localhost:27022 -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-resources: 7 revs updated. (1.0.1-1341-g092fae6)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated discards 609a746aa38f3105b18818de76d91b87a4f0b0c2 (commit) discards 886316a9092a8958246c4c8d9e473b8f6667c67f (commit) discards 901be31899b6a5d3a27641d459c628c0a3f82471 (commit) discards c01294b7b23ddc91dbe162b8a8d2e0fa0fb8b56b (commit) discards fafa009058ca0f147fdf648b64a5e33a70add5e2 (commit) discards 561825ff0314387136c8855d9e6520f71b6c8697 (commit) to 092fae6e00d50f7d7474b560cf1295b3d13f (commit) via 040887e5f31b8279304081f0c42778ddaa8fb2de (commit) via 909900a331492f6ec12cefcc4ae3734e25a6a884 (commit) via b1be7f4f5b9fda17bede60d38c25b0d964ef5d2b (commit) via 9a27caa9dfed2330cbd1c650bb23f7302b9d39cd (commit) via 799b1b18937c3d2934da47520d9f50d2e2aadb30 (commit) via cf2d0cc1f4cfb1b459c19cffc0b99ab71f02adc4 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (609a746aa38f3105b18818de76d91b87a4f0b0c2) \ N -- N -- N (092fae6e00d50f7d7474b560cf1295b3d13f) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 799b1b18937c3d2934da47520d9f50d2e2aadb30 Author: Till Hofmann AuthorDate: Thu May 31 09:33:15 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 19:04:21 2018 +0200 clips-executive: make REJECTED an outcome instead of a mode We also need to evaluate the goal if it was REJECTED, e.g., to release acquired resources. Also, REJECTED is similar to FAILED, except that a goal can not be rejected if it has already been COMMITTED or DISPATCHED. For this purpose, remove the REJECTED mode and add REJECTED as an outcome instead. http://git.fawkesrobotics.org/fawkes.git/commit/799b1b1 http://trac.fawkesrobotics.org/changeset/799b1b1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9a27caa9dfed2330cbd1c650bb23f7302b9d39cd Author: Till Hofmann AuthorDate: Thu May 31 09:47:37 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 19:04:21 2018 +0200 clips executive: add RETRACTED mode to the goal specification A goal with mode RETRACTED is scheduled for destruction and cannot be used for any further operations. Adding this mode allows to do cleanup for an finished and evaluated goal, e.g., releasing acquired resources. http://git.fawkesrobotics.org/fawkes.git/commit/9a27caa http://trac.fawkesrobotics.org/changeset/9a27caa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b1be7f4f5b9fda17bede60d38c25b0d964ef5d2b Author: Till Hofmann AuthorDate: Thu May 31 10:04:13 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 19:04:21 2018 +0200 clips-executive: adapt test scenario to new goal mode RETRACTED Instead of directly retracting an EVALUATED goal, first clean up the goal, change the goal mode to RETRACTED, and then retract the goal fact. This does not do more cleanup than before, it merely adds the transition to RETRACTED. http://git.fawkesrobotics.org/fawkes.git/commit/b1be7f4 http://trac.fawkesrobotics.org/changeset/b1be7f4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 909900a331492f6ec12cefcc4ae3734e25a6a884 Author: Till Hofmann AuthorDate: Thu May 31 15:52:35 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 19:04:21 2018 +0200 clips-executive: add required and acquired resources to the goal spec A required resource is a resource that the agent needs to hold before the goal can be dispatched. An acquired resource is a resource that the agent is currently holding. A goal can only be dispatched if the required resources are a subset of the acquired resources. A resource is NOT removed from the required resources when the agent gets the resource. http://git.fawkesrobotics.org/fawkes.git/commit/909900a http://trac.fawkesrobotics.org/changeset/909900a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 040887e5f31b8279304081f0c42778ddaa8fb2de Author: Ti
[Fawkes Git] branch/thofmann/clips-executive-resources: 5 revs updated. (1.0.1-1340-g609a746)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated discards 8b41a56e1ea402466756742b4355cc34160309cc (commit) discards e540ec64a4376856faf4998ab242d0bd7f7b4249 (commit) discards 8ffbf31b69e60be157bbbe844491b305b077c756 (commit) discards 7ff1861faf29a7c62512f4c1ca5829451cea456e (commit) discards da77800717e388424a19d7ef01be0a449ac3c21a (commit) to 609a746aa38f3105b18818de76d91b87a4f0b0c2 (commit) via 886316a9092a8958246c4c8d9e473b8f6667c67f (commit) via 901be31899b6a5d3a27641d459c628c0a3f82471 (commit) via c01294b7b23ddc91dbe162b8a8d2e0fa0fb8b56b (commit) via fafa009058ca0f147fdf648b64a5e33a70add5e2 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (8b41a56e1ea402466756742b4355cc34160309cc) \ N -- N -- N (609a746aa38f3105b18818de76d91b87a4f0b0c2) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit fafa009058ca0f147fdf648b64a5e33a70add5e2 Author: Till Hofmann AuthorDate: Thu May 31 09:47:37 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 18:07:09 2018 +0200 clips executive: add RETRACTED mode to the goal specification A goal with mode RETRACTED is scheduled for destruction and cannot be used for any further operations. Adding this mode allows to do cleanup for an finished and evaluated goal, e.g., releasing acquired resources. http://git.fawkesrobotics.org/fawkes.git/commit/fafa009 http://trac.fawkesrobotics.org/changeset/fafa009 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c01294b7b23ddc91dbe162b8a8d2e0fa0fb8b56b Author: Till Hofmann AuthorDate: Thu May 31 10:04:13 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 18:07:09 2018 +0200 clips-executive: adapt test scenario to new goal mode RETRACTED Instead of directly retracting an EVALUATED goal, first clean up the goal, change the goal mode to RETRACTED, and then retract the goal fact. This does not do more cleanup than before, it merely adds the transition to RETRACTED. http://git.fawkesrobotics.org/fawkes.git/commit/c01294b http://trac.fawkesrobotics.org/changeset/c01294b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 901be31899b6a5d3a27641d459c628c0a3f82471 Author: Till Hofmann AuthorDate: Thu May 31 15:52:35 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 18:07:09 2018 +0200 clips-executive: add required and acquired resources to the goal spec A required resource is a resource that the agent needs to hold before the goal can be dispatched. An acquired resource is a resource that the agent is currently holding. A goal can only be dispatched if the required resources are a subset of the acquired resources. A resource is NOT removed from the required resources when the agent gets the resource. http://git.fawkesrobotics.org/fawkes.git/commit/901be31 http://trac.fawkesrobotics.org/changeset/901be31 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 886316a9092a8958246c4c8d9e473b8f6667c67f Author: Till Hofmann AuthorDate: Thu May 31 15:55:49 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 18:07:09 2018 +0200 clips executive: adapt prototype goal reasoner to resources Modify the test scenario goal reasoner to take care of resources: 1. A goal can only be dispatched if all required resources are acquired. 2. A goal can only be retracted if no resource is acquired anymore, i.e., all resources have been released. http://git.fawkesrobotics.org/fawkes.git/commit/886316a http://trac.fawkesrobotics.org/changeset/886316a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 609a746aa38f3105b18818de76d91b87a4f0b0c2 Author: Till Hofmann AuthorDate: Thu May 31 17:53:33 2018 +0200 Commit: Till Hofmann CommitDate: Thu May 31 18:07:09 2018 +0200 clips-executive: add lock/unlock mechanism for resource locks This automatically locks and unlocks the
[Fawkes Git] branch/thofmann/clips-executive-resources: clips-executive: only release resources that have no pending request
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated discards 860f9d92fa753c0bfe4c23b4842641d3079c1ba8 (commit) to 29f46c9593a995daea50d49a10aabb1fb4852d0d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (860f9d92fa753c0bfe4c23b4842641d3079c1ba8) \ N -- N -- N (29f46c9593a995daea50d49a10aabb1fb4852d0d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 29f46c9593a995daea50d49a10aabb1fb4852d0d Author: Till Hofmann AuthorDate: Sat Jun 2 00:05:34 2018 +0200 Commit: Till Hofmann CommitDate: Sat Jun 2 00:05:34 2018 +0200 clips-executive: only release resources that have no pending request In some cases, the goal may be cleaned up multiple times. To make sure that we unlock the goal's resources properly, first check whether there is already a pending request. Only try to unlock the resource if there is no pending request. http://git.fawkesrobotics.org/fawkes.git/commit/29f46c9 http://trac.fawkesrobotics.org/changeset/29f46c9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) - *Diffs* - - *commit* 29f46c9593a995daea50d49a10aabb1fb4852d0d - - - - - - - - - - Author: Till Hofmann Date:Sat Jun 2 00:05:34 2018 +0200 Subject: clips-executive: only release resources that have no pending request .../clips-executive/clips/resource-locks.clp |5 - 1 files changed, 4 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index 2de5c3c..2fbb0f2 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -102,7 +102,10 @@ ?g <- (goal (mode RETRACTED) (acquired-resources $?acq)) => (foreach ?res ?acq -(if (not (any-factp ((?m mutex)) (neq ?m:request NONE))) then +(if (not (any-factp ((?m mutex)) +(and (eq ?m:name (resource-to-mutex ?res)) + (eq ?m:request UNLOCK + then (printout warn "Unlocking resource " ?res crlf) (mutex-unlock-async (resource-to-mutex ?res)) ) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-resources: 2 revs updated. (1.0.1-1346-g860f9d9)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated to 860f9d92fa753c0bfe4c23b4842641d3079c1ba8 (commit) via 1cda79f332b39fb287a6c9525029071401709134 (commit) from 1e6f98fd5620d17edaa6ea01174301048a874380 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 1cda79f332b39fb287a6c9525029071401709134 Author: Till Hofmann AuthorDate: Thu Apr 26 19:41:29 2018 +0200 Commit: Till Hofmann CommitDate: Fri Jun 1 21:41:59 2018 +0200 clips-executive: also create pending effects if action is not waiting We may be interested of pending effects of an action even if the action is not waiting for pending effects. This allows us to check and track the pending effects even after the action was already set to EXECUTION-SUCCEEDED. http://git.fawkesrobotics.org/fawkes.git/commit/1cda79f http://trac.fawkesrobotics.org/changeset/1cda79f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 860f9d92fa753c0bfe4c23b4842641d3079c1ba8 Author: Till Hofmann AuthorDate: Fri Jun 1 22:14:03 2018 +0200 Commit: Till Hofmann CommitDate: Fri Jun 1 22:14:03 2018 +0200 clips-executive: always unlock all resources of a retracted goal We used to check whether there were any pending mutex requests. However, this causes to not ever release the resources if there was a pending request during cleanup, even if it was not related to the goal. If there is already a pending request related to this goal, this is always an error. Trying to unlock will make this error more visible. http://git.fawkesrobotics.org/fawkes.git/commit/860f9d9 http://trac.fawkesrobotics.org/changeset/860f9d9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/domain.clp |6 +++--- .../clips-executive/clips/resource-locks.clp |6 ++ 2 files changed, 5 insertions(+), 7 deletions(-) - *Diffs* - - *commit* 1cda79f332b39fb287a6c9525029071401709134 - - - - - - - - - - Author: Till Hofmann Date:Thu Apr 26 19:41:29 2018 +0200 Subject: clips-executive: also create pending effects if action is not waiting src/plugins/clips-executive/clips/domain.clp |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index f42dbca..3decb23 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -710,7 +710,7 @@ (status EXECUTION-SUCCEEDED) (param-names $?action-param-names) (param-values $?action-param-values)) - (domain-operator (name ?op) (wait-sensed TRUE)) + (domain-operator (name ?op)) => (bind ?next-state SENSED-EFFECTS-HOLD) (do-for-all-facts ((?e domain-effect) (?pred domain-predicate)) @@ -735,9 +735,9 @@ ) (defrule domain-effects-ignore-sensed - "Apply effects of an action after it succeeded." + "Do not wait for sensed effects if the operator is not a waiting operator." (declare (salience ?*SALIENCE-DOMAIN-APPLY*)) - ?pa <- (plan-action (id ?id) (action-name ?op) (status EXECUTION-SUCCEEDED)) + ?pa <- (plan-action (id ?id) (action-name ?op) (status SENSED-EFFECTS-WAIT)) (domain-operator (name ?op) (wait-sensed FALSE)) => (modify ?pa (status SENSED-EFFECTS-HOLD)) - *commit* 860f9d92fa753c0bfe4c23b4842641d3079c1ba8 - - - - - - - - - - Author: Till Hofmann Date:Fri Jun 1 22:14:03 2018 +0200 Subject: clips-executive: always unlock all resources of a retracted goal .../clips-executive/clips/resource-locks.clp |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index 2de5c3c..da1829c 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -102,10 +102,8 @@ ?g <- (goal (mode RETRACTED) (acquired-resources $?acq)) => (foreach ?res ?acq -(if (
[Fawkes Git] branch/thofmann/clips-executive-resources: clips-executive: directly reject a goal if a resource is locked
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated to 6d06273402bbf9d29e54ccc6162fe5995a7f877e (commit) from 6aca9cde0173c16c3e4944d7e454f93480626b47 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 6d06273402bbf9d29e54ccc6162fe5995a7f877e Author: Till Hofmann AuthorDate: Tue Jun 5 23:42:02 2018 +0200 Commit: Till Hofmann CommitDate: Tue Jun 5 23:42:02 2018 +0200 clips-executive: directly reject a goal if a resource is locked We often know the states of the mutexes, no need to always try to lock it. Instead, directly reject the goal. This also fixes an issue where a second goal is committed and then tries to get a mutex that is already locked by the same agent because of a different goal, thereby leading to a mutex error. http://git.fawkesrobotics.org/fawkes.git/commit/6d06273 http://trac.fawkesrobotics.org/changeset/6d06273 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 6d06273402bbf9d29e54ccc6162fe5995a7f877e - - - - - - - - - - Author: Till Hofmann Date:Tue Jun 5 23:42:02 2018 +0200 Subject: clips-executive: directly reject a goal if a resource is locked .../clips-executive/clips/resource-locks.clp | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index 2fbb0f2..02eb6fc 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -37,8 +37,12 @@ (goal (mode COMMITTED) (acquired-resources $?acq) (required-resources $?req)) + ; We may have multiple goals requiring the same resource. If that's the case, + ; wait until the other goal releases the resources. (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) (request ~NONE))) + (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) + (state ~OPEN))) => (foreach ?res (set-diff ?req ?acq) (printout warn "Locking resource " ?res crlf) @@ -46,6 +50,21 @@ ) ) +(defrule resource-locks-fast-reject-goal + "If a resource is locked by someone else, we have not acquired any resources, + and we have no pending requests, then we can directly reject the goal." + (wm-fact (key cx identity) (value ?identity)) + ?g <- (goal (mode COMMITTED) + (acquired-resources) + (required-resources $?req)) + (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) + (state LOCKED) (locked-by ?locker&~?identity)) + (not (mutex (name ?n&:(member$ (mutex-to-resource ?n) ?req)) + (request ~NONE))) + => + (modify ?g (mode FINISHED) (outcome REJECTED)) +) + (defrule resource-locks-lock-acquired ?m <- (mutex (name ?res) (request LOCK) (response ACQUIRED)) ?g <- (goal (mode COMMITTED) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/labrpxlr2/rcll-paused: deleted (1.0.1-767-gf905495)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, labrpxlr2/rcll-paused has been deleted was f9054952db2dbd275648119440e211891fccc958 f9054952db2dbd275648119440e211891fccc958 excluded send-beacon from operator check added paused states -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-resources: clips-executive: on wm update, only delete domain objs of the same type
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated to 864e60c4eebc0a89d4cba85b9bbd5bfc4b94deb6 (commit) from 6d06273402bbf9d29e54ccc6162fe5995a7f877e (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 864e60c4eebc0a89d4cba85b9bbd5bfc4b94deb6 Author: Till Hofmann AuthorDate: Wed Jun 6 18:50:07 2018 +0200 Commit: Till Hofmann CommitDate: Wed Jun 6 18:50:07 2018 +0200 clips-executive: on wm update, only delete domain objs of the same type If an object is removed from the worldmodel (by removing it of the list of objects of that type), only delete those domain objects that have the correct type. This fixes a bug that would delete all domain objects of a different type if one object is removed from the worldmodel. http://git.fawkesrobotics.org/fawkes.git/commit/864e60c http://trac.fawkesrobotics.org/changeset/864e60c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/wm-domain-sync.clp |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 864e60c4eebc0a89d4cba85b9bbd5bfc4b94deb6 - - - - - - - - - - Author: Till Hofmann Date:Wed Jun 6 18:50:07 2018 +0200 Subject: clips-executive: on wm update, only delete domain objs of the same type .../clips-executive/clips/wm-domain-sync.clp |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/wm-domain-sync.clp b/src/plugins/clips-executive/clips/wm-domain-sync.clp index 116b4a7..751dc60 100644 --- a/src/plugins/clips-executive/clips/wm-domain-sync.clp +++ b/src/plugins/clips-executive/clips/wm-domain-sync.clp @@ -510,7 +510,8 @@ ?wf <- (wm-fact (id ?id) (type SYMBOL) (is-list TRUE) (values $?objs&~:(member$ ?name ?objs))) (test (> (fact-index ?wf) ?wf-idx)) => - (delayed-do-for-all-facts ((?df domain-object)) (not (member$ ?df:name ?objs)) + (delayed-do-for-all-facts ((?df domain-object)) +(and (eq ?df:type ?type) (not (member$ ?df:name ?objs))) (retract ?df) ) (modify ?wm (wm-fact-idx (fact-index ?wf))) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/labrpxlr2/rcll: created (1.0.1-767-gf905495)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, labrpxlr2/rcll has been created at f9054952db2dbd275648119440e211891fccc958 (commit) http://git.fawkesrobotics.org/fawkes.git/labrpxlr2/rcll - *Log* --- commit f9054952db2dbd275648119440e211891fccc958 Author: Fabian Stein AuthorDate: Fri Apr 13 12:04:30 2018 +0200 Commit: Fabian Stein CommitDate: Fri Apr 13 12:04:30 2018 +0200 excluded send-beacon from operator check added paused states http://git.fawkesrobotics.org/fawkes.git/commit/f905495 http://trac.fawkesrobotics.org/changeset/f905495 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* f9054952db2dbd275648119440e211891fccc958 - - - - - - - - - - Author: Fabian Stein Date:Fri Apr 13 12:04:30 2018 +0200 Subject: excluded send-beacon from operator check added paused states src/plugins/clips-executive/clips/domain.clp |2 +- src/plugins/clips-executive/clips/plan.clp |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index da005f0..49d5b7d 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -568,7 +568,7 @@ (defrule domain-check-operator-of-action-exists "Make sure that for each action in a plan, the respective operator exists." - (plan-action (action-name ?op)) + (plan-action (action-name ?op& : (neq ?op send-beacon))) (not (domain-operator (name ?op))) => (assert (domain-error (error-type operator-of-action-does-not-exist) diff --git a/src/plugins/clips-executive/clips/plan.clp b/src/plugins/clips-executive/clips/plan.clp index 3036784..4e55060 100644 --- a/src/plugins/clips-executive/clips/plan.clp +++ b/src/plugins/clips-executive/clips/plan.clp @@ -11,7 +11,7 @@ (deftemplate goal (slot id (type SYMBOL)) (slot type (type SYMBOL) (allowed-values ACHIEVE MAINTAIN) (default ACHIEVE)) - (slot mode (type SYMBOL) (allowed-values FORMULATED SELECTED EXPANDED + (slot mode (type SYMBOL) (allowed-values FORMULATED PAUSED SELECTED EXPANDED COMMITTED DISPATCHED COMPLETED FAILED)) (slot parent (type SYMBOL)) ) @@ -30,7 +30,7 @@ (multislot param-values) (slot duration (type FLOAT)) (slot dispatch-time (type FLOAT)) - (slot status (type SYMBOL) (allowed-values FORMULATED PENDING WAITING RUNNING EXECUTION-SUCCEEDED EFFECTS-APPLIED FINAL EXECUTION-FAILED FAILED)) + (slot status (type SYMBOL) (allowed-values FORMULATED PENDING PAUSED WAITING RUNNING EXECUTION-SUCCEEDED EFFECTS-APPLIED FINAL EXECUTION-FAILED FAILED)) (slot executable (type SYMBOL) (allowed-values TRUE FALSE) (default FALSE)) ) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/laser-calibration: laser calibration: add documentation
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/laser-calibration has been updated
to 7b2b672142e83b9f432b2fe989ce580c5f09f386 (commit)
from f61d9f966863c826bce5bd2aafa97e02edef3556 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/laser-calibration
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 7b2b672142e83b9f432b2fe989ce580c5f09f386
Author: Till Hofmann
AuthorDate: Tue May 29 18:37:28 2018 +0200
Commit: Till Hofmann
CommitDate: Tue May 29 18:39:01 2018 +0200
laser calibration: add documentation
http://git.fawkesrobotics.org/fawkes.git/commit/7b2b672
http://trac.fawkesrobotics.org/changeset/7b2b672
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/tools/laser_calibration/laser_calibration.cpp | 71 +++-
src/tools/laser_calibration/laser_calibration.h| 15 -
src/tools/laser_calibration/main.cpp | 12 +++-
src/tools/laser_calibration/pitch_calibration.cpp | 24 ++-
src/tools/laser_calibration/pitch_calibration.h|1 +
src/tools/laser_calibration/roll_calibration.cpp | 31 -
src/tools/laser_calibration/roll_calibration.h |1 +
.../laser_calibration/time_offset_calibration.cpp | 39 +++-
.../laser_calibration/time_offset_calibration.h|6 ++
src/tools/laser_calibration/yaw_calibration.cpp| 33 +-
src/tools/laser_calibration/yaw_calibration.h |8 ++
11 files changed, 234 insertions(+), 7 deletions(-)
- *Diffs* -
- *commit* 7b2b672142e83b9f432b2fe989ce580c5f09f386 - - - - - - - - - -
Author: Till Hofmann
Date:Tue May 29 18:37:28 2018 +0200
Subject: laser calibration: add documentation
src/tools/laser_calibration/laser_calibration.cpp | 71 +++-
src/tools/laser_calibration/laser_calibration.h| 15 -
src/tools/laser_calibration/main.cpp | 12 +++-
src/tools/laser_calibration/pitch_calibration.cpp | 24 ++-
src/tools/laser_calibration/pitch_calibration.h|1 +
src/tools/laser_calibration/roll_calibration.cpp | 31 -
src/tools/laser_calibration/roll_calibration.h |1 +
.../laser_calibration/time_offset_calibration.cpp | 39 +++-
.../laser_calibration/time_offset_calibration.h|6 ++
src/tools/laser_calibration/yaw_calibration.cpp| 33 +-
src/tools/laser_calibration/yaw_calibration.h |8 ++
11 files changed, 234 insertions(+), 7 deletions(-)
_Diff for modified files_:
diff --git a/src/tools/laser_calibration/laser_calibration.cpp
b/src/tools/laser_calibration/laser_calibration.cpp
index bc5e193..c2bb1af 100644
--- a/src/tools/laser_calibration/laser_calibration.cpp
+++ b/src/tools/laser_calibration/laser_calibration.cpp
@@ -2,7 +2,7 @@
* laser_calibration.cpp - Tool to calibrate laser transforms
*
* Created: Mon 10 Jul 2017 17:37:21 CEST 17:37
- * Copyright 2017 Till Hofmann
+ * Copyright 2017-2018 Till Hofmann
/
/* This program is free software; you can redistribute it and/or modify
@@ -33,12 +33,37 @@
using namespace fawkes;
using namespace std;
+/** @class LaserCalibration "laser_calibration.h"
+ * Abstract base class for laser calibration. The class provides functions
that
+ * are common for all calibration methods.
+ * @author Till Hofmann
+ */
+
+/** @fn LaserCalibration::calibrate
+ * The actual calibration procedure.
+ * Virtual function that is called once to calibrate the laser.
+ */
+
+/** Constructor.
+ * @param laser The laser interface to fetch data from
+ * @param tf_transformer The transformer to use to compute transforms
+ * @param config The network config to read from and write updates to
+ * @param config_path The config path to read from and write updates to
+ */
LaserCalibration::LaserCalibration(LaserInterface *laser, tf::Transformer
*tf_transformer, NetworkConfiguration *config, string config_path)
: laser_(laser), tf_transformer_(tf_transformer), config_(config),
config_path_(config_path) {}
+
+/** Destructor. */
LaserCalibration::~LaserCalibration() {}
+/** Convert the laser data into a pointcloud.
+ * The frame of the pointcloud is set to the frame of the laser, no transform
+ * is applied.
+ * @param laser The laser interface to read the data from
+ * @return A pointer to a pointcloud that con
[Fawkes Git] branch/thofmann/clips-executive-resources: 3 revs updated. (1.0.1-1344-g1e6f98f)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-resources has been updated to 1e6f98fd5620d17edaa6ea01174301048a874380 (commit) via 92a9402576537140a8a8bb4d2266bdaaf7cd5001 (commit) via a49e1016dc3d149b7b37798e7ca4caa49289d71b (commit) from 092fae6e00d50f7d7474b560cf1295b3d13f (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-resources Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit a49e1016dc3d149b7b37798e7ca4caa49289d71b Author: Till Hofmann AuthorDate: Fri Jun 1 12:09:00 2018 +0200 Commit: Till Hofmann CommitDate: Fri Jun 1 12:09:00 2018 +0200 clips-executive: release all acquired resources before rejecting a goal If we fail to acquire one required resource, first release all resources that have already been acquired before rejecting the goal. Otherwise, the next goal may try to acquire the resource again and fail. http://git.fawkesrobotics.org/fawkes.git/commit/a49e101 http://trac.fawkesrobotics.org/changeset/a49e101 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 92a9402576537140a8a8bb4d2266bdaaf7cd5001 Author: Till Hofmann AuthorDate: Fri Jun 1 19:38:06 2018 +0200 Commit: Till Hofmann CommitDate: Fri Jun 1 19:38:06 2018 +0200 clips-executive: prepend all resource locks with resource- http://git.fawkesrobotics.org/fawkes.git/commit/92a9402 http://trac.fawkesrobotics.org/changeset/92a9402 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1e6f98fd5620d17edaa6ea01174301048a874380 Author: Till Hofmann AuthorDate: Fri Jun 1 19:39:05 2018 +0200 Commit: Till Hofmann CommitDate: Fri Jun 1 19:39:05 2018 +0200 clips-executive: treat errors during resource locking as rejections http://git.fawkesrobotics.org/fawkes.git/commit/1e6f98f http://trac.fawkesrobotics.org/changeset/1e6f98f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/resource-locks.clp | 75 +++ 1 files changed, 59 insertions(+), 16 deletions(-) - *Diffs* - - *commit* a49e1016dc3d149b7b37798e7ca4caa49289d71b - - - - - - - - - - Author: Till Hofmann Date:Fri Jun 1 12:09:00 2018 +0200 Subject: clips-executive: release all acquired resources before rejecting a goal .../clips-executive/clips/resource-locks.clp | 43 +++- 1 files changed, 32 insertions(+), 11 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/resource-locks.clp b/src/plugins/clips-executive/clips/resource-locks.clp index a708a10..b541001 100644 --- a/src/plugins/clips-executive/clips/resource-locks.clp +++ b/src/plugins/clips-executive/clips/resource-locks.clp @@ -22,14 +22,12 @@ (defrule resource-locks-request-lock (goal (mode COMMITTED) (acquired-resources $?acq) -(required-resources $?req&:(set-diff ?req ?acq))) - (not (mutex (name ?res) (request ~NONE))) +(required-resources $?req) + (not (mutex (name ?n&:(member$ ?n ?req)) (request ~NONE))) => (foreach ?res (set-diff ?req ?acq) -(if (not (any-factp ((?m mutex)) (neq ?m:request NONE))) then - (printout warn "Trying to lock " ?res crlf) - (mutex-try-lock-async ?res) -) +(printout warn "Trying to lock " ?res crlf) +(mutex-try-lock-async ?res) ) ) @@ -43,17 +41,41 @@ (modify ?m (request NONE) (response NONE)) ) -(defrule resource-locks-lock-rejected +; TODO: deal with mutex errors (response ERROR) +(defrule resource-locks-lock-rejected-release-acquired-resources + "A lock was rejected, therefore release all acquired resources." ?m <- (mutex (name ?res) (request LOCK) - (response REJECTED|ERROR) + (response REJECTED) (error-msg ?err)) ?g <- (goal (mode COMMITTED) (required-resources $?req) (acquired-resources $?acq&:(member$ ?res (set-diff ?req ?acq + ; We cannot abort a pending request. Thus, we first need to wait to get + ; responses for all requested locks. + (not (mutex (name ?res&:(member$ ?req)) (response PENDING))) + => + (do-for-all-facts ((?om mutex)) (member$ ?om:name ?acq) +(mutex-unlock-async ?om:name) + ) +) + +(defrule resource-locks-reject-goal-on-rejected-lock + "A lock was rejected and no resource i
[Fawkes Git] branch/common/current: 85 revs updated. (1.0.1-1145-g85cbaae)
via 94a54c95c0e8726a4fa564de0ad1fb408752c46f (commit) via abd62e4b23fdd91f8c89a103c89cbb1c952378a2 (commit) via 913018c8804fa3e20f77ee47f22a2744ae651f76 (commit) via 419cc8cd9045a00765003c2fd42c056639264d5f (commit) via b883ed68b7291b3ba7f8a508706a0f5692c843b5 (commit) via 1c75b1678c5070c8da9dee0a75c2da1fc09514f6 (commit) via 56e7272fa748f68ab1aabde14063d2ce8a36b8e9 (commit) via 0bebad7e6cc977fb9dc43233b626cf4b1cea480f (commit) via c841bbdc88ec92555b62b4b7d2783a734a80a053 (commit) from ef9903f1fd87a285890a1378bea791cc908f9baa (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 36ce979684c185282822c6d9ae89e9cdd966f81e Merge: ef9903f ec26175 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 24 18:02:51 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 24 18:02:51 2018 +0200 Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/36ce979 http://trac.fawkesrobotics.org/changeset/36ce979 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 64a035c2810423a891f35604b8734b75be0bb752 Merge: 36ce979 ba10c1c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 24 18:24:56 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 24 18:24:56 2018 +0200 Merge remote-tracking branch 'remotes/origin/timn/yaml-sequence-maps' into current http://git.fawkesrobotics.org/fawkes.git/commit/64a035c http://trac.fawkesrobotics.org/changeset/64a035c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 96f23388e3207f0bb788d2f0d6aab11aa626be32 Merge: 64a035c b1a813e Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 24 20:57:51 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 24 20:57:51 2018 +0200 Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/96f2338 http://trac.fawkesrobotics.org/changeset/96f2338 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6f0fb3f4611733204e2f210499e10ece0e861c10 Merge: 96f2338 56b226b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Apr 25 12:31:34 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 25 12:31:34 2018 +0200 Merge remote-tracking branch 'origin/timn/clips-executive-wm-robmem-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/6f0fb3f http://trac.fawkesrobotics.org/changeset/6f0fb3f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e3b698725b26ccd8d8d0849027166e3b175e85bf Merge: 6f0fb3f 9c1afea Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Apr 25 12:31:44 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 25 12:31:44 2018 +0200 Merge remote-tracking branch 'origin/thofmann/cx-wm-robmem-sync-blackboard-init-fix' into current http://git.fawkesrobotics.org/fawkes.git/commit/e3b6987 http://trac.fawkesrobotics.org/changeset/e3b6987 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3c7d954fb0a6911af2dcaf7b7bb6e8f49f1c1020 Merge: e3b6987 f61d9f9 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Apr 25 21:03:00 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 25 21:03:00 2018 +0200 Merge remote-tracking branch 'origin/thofmann/laser-calibration' into current http://git.fawkesrobotics.org/fawkes.git/commit/3c7d954 http://trac.fawkesrobotics.org/changeset/3c7d954 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1e0e468699cc4355d81f2e3fc6add90b091c5d84 Author: Nicolas Limpert <limp...@fh-aachen.de> AuthorDate: Wed Apr 25 21:46:14 2018 +0200 Commit: Nicolas Limpert <limp...@fh-aachen.de> CommitDate: Wed Apr 25 22:19:16 2018 +0200 laser-filter: add Makefile for interfaces subfolder http://git.fawkesrobotics.org/fawkes.git/commit/1e0e468 http://trac.fawkesrobotics.org/changeset/1e0e468 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 088d2a8013662db7c26ce89f9e907ee43b03d0d2 Author: Nicolas Limpert <limp...@fh-aachen.de> AuthorDate: Wed Apr 25 21:47:22 2018 +0200 Commit: Nicolas Limpert <limp...@fh-aachen.de> CommitDate: Wed Apr 25 22:19:16 2018 +0200 laser-filter: add LaserBoxFil
[Fawkes Git] branch/common/current-labrpxlr: 2 revs updated. (1.0.1-563-g584af03)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-labrpxlr has been updated to 584af0310e396b809f2523fe27f933017a1dd37e (commit) via 9c24ed660e5ed68dce5513146e9e6b44a6221546 (commit) from 2ce91761266a80af3abee20d556b7c4901380f55 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-labrpxlr Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 9c24ed660e5ed68dce5513146e9e6b44a6221546 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Oct 26 23:24:03 2017 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Oct 26 23:24:03 2017 +0200 clips-executive: make sure sub-precond belongs to the same action When checking whether a negated precondition is true, the checked sub-precondition must be grounded with same action. Otherwise, we could evaluate the precondition of another action on accident. http://git.fawkesrobotics.org/fawkes.git/commit/9c24ed6 http://trac.fawkesrobotics.org/changeset/9c24ed6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 584af0310e396b809f2523fe27f933017a1dd37e Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Oct 26 23:30:45 2017 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Oct 26 23:30:45 2017 +0200 clips-executive: retract all grounded preconditions on wm change Whenever we apply a change to the domain world model, retract all grounded preconditions and reground them later. This makes sure that we always have the correct grounding. http://git.fawkesrobotics.org/fawkes.git/commit/584af03 http://trac.fawkesrobotics.org/changeset/584af03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/domain.clp | 37 +++--- 1 files changed, 33 insertions(+), 4 deletions(-) - *Diffs* - - *commit* 9c24ed660e5ed68dce5513146e9e6b44a6221546 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Oct 26 23:24:03 2017 +0200 Subject: clips-executive: make sure sub-precond belongs to the same action src/plugins/clips-executive/clips/domain.clp | 10 ++ 1 files changed, 6 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index 62d0c7b..e9261bc 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -226,12 +226,13 @@ ?precond <- (domain-precondition (type negation) (grounded TRUE) +(action ?action-id) (name ?pn) (is-satisfied FALSE)) (or (domain-atomic-precondition -(part-of ?pn) (grounded TRUE) (is-satisfied FALSE)) +(action ?action-id) (part-of ?pn) (grounded TRUE) (is-satisfied FALSE)) (domain-precondition -(part-of ?pn) (grounded TRUE) (is-satisfied FALSE))) +(action ?action-id) (part-of ?pn) (grounded TRUE) (is-satisfied FALSE))) => (modify ?precond (is-satisfied TRUE)) ) @@ -242,12 +243,13 @@ ?precond <- (domain-precondition (type negation) (name ?pn) +(action ?action-id) (is-satisfied TRUE) (grounded TRUE)) (or (domain-atomic-precondition -(part-of ?pn) (grounded TRUE) (is-satisfied TRUE)) +(action ?action-id) (part-of ?pn) (grounded TRUE) (is-satisfied TRUE)) (domain-precondition -(part-of ?pn) (grounded TRUE) (is-satisfied TRUE))) +(action ?action-id) (part-of ?pn) (grounded TRUE) (is-satisfied TRUE))) => (modify ?precond (is-satisfied FALSE)) ) - *commit* 584af0310e396b809f2523fe27f933017a1dd37e - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Oct 26 23:30:45 2017 +0200 Subject: clips-executive: retract all grounded preconditions on wm change src/plugins/clips-executive/clips/domain.clp | 27 ++ 1 files changed, 27 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index e9261bc..1d0b611 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.cl
[Fawkes Git] branch/common/current-labrpxlr: created (1.0.1-561-g2ce9176)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-labrpxlr has been created at 2ce91761266a80af3abee20d556b7c4901380f55 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-labrpxlr - *Log* --- commit 2ce91761266a80af3abee20d556b7c4901380f55 Merge: 6ad02d9 1b3758b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Oct 26 19:20:58 2017 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Oct 26 19:20:58 2017 +0200 Merge remote-tracking branch 'origin/common/clips-executive' into current-labrpxlr http://git.fawkesrobotics.org/fawkes.git/commit/2ce9176 http://trac.fawkesrobotics.org/changeset/2ce9176 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* 2ce91761266a80af3abee20d556b7c4901380f55 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Oct 26 19:20:58 2017 +0200 Subject: Merge remote-tracking branch 'origin/common/clips-executive' into current-labrpxlr cfg/conf.d/clips-executive.yaml| 66 etc/buildsys/clang.mk | 19 +- etc/buildsys/clips.mk | 38 +-- etc/buildsys/gcc.mk| 38 +- src/plugins/Makefile |1 + src/plugins/clips-executive/Makefile | 52 +++ src/plugins/clips-executive/clips/Makefile | 18 + .../clips-executive/clips/blackboard-init.clp |7 + src/plugins/clips-executive/clips/domain.clp | 371 .../clips-executive/clips/exectest-init.clp|9 + src/plugins/clips-executive/clips/exectest.clp | 18 + src/plugins/clips-executive/clips/init.clp | 117 ++ src/plugins/clips-executive/clips/plan-exec.clp| 57 +++ src/plugins/clips-executive/clips/plan.clp | 40 +++ src/plugins/clips-executive/clips/skills-init.clp | 31 ++ src/plugins/clips-executive/clips/skills.clp | 187 ++ .../clips/test-scenario/action-selection.clp | 27 ++ .../clips/test-scenario/execution-monitoring.clp |4 + .../clips/test-scenario/fixed-sequence.clp | 14 + .../clips/test-scenario/goal-reasoner.clp | 90 + .../clips/test-scenario/test-domain.clp| 32 ++ src/plugins/clips-executive/clips/tests/Makefile | 48 +++ .../clips-executive/clips/tests/blocksworld.clp| 68 .../clips-executive/clips/tests/clips_test.h | 85 + .../clips-executive/clips/tests/test_domain.cpp| 259 ++ .../clips-executive/clips/tests/test_example.clp | 16 + .../clips-executive/clips/tests/test_example.cpp | 41 +++ .../clips-executive/clips_executive_plugin.cpp | 45 +++ .../clips-executive/clips_executive_thread.cpp | 204 +++ .../clips-executive/clips_executive_thread.h | 71 src/plugins/clips-executive/map_skill.cpp | 243 + src/plugins/clips-executive/map_skill.h| 47 +++ src/plugins/clips/clips/blackboard.clp |9 + src/plugins/clips/feature_blackboard.cpp | 137 +--- src/plugins/clips/feature_config.cpp | 17 +- 35 files changed, 2425 insertions(+), 101 deletions(-) _Diff for modified files_: diff --cc src/plugins/Makefile index 38855f6,fcbf069..3c401f2 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@@ -26,12 -26,10 +26,13 @@@ SUBDIRS= bbsync bblogger webview ttmai static_transforms navgraph navgraph-clusters navgraph-generator colli \ clips clips-agent clips-protobuf clips-webview clips-navgraph clips-ros \ clips-tf openprs openprs-agent eclipse-clp \ -mongodb mongodb_log robot-memory clips-robot-memory pddl-robot-memory \ -openrave-robot-memory openni refboxcomm ros player xmlrpc gossip \ +mongodb mongodb_log \ +robot-memory clips-robot-memory pddl-robot-memory openrave-robot-memory \ +openni refboxcomm ros player xmlrpc gossip \ robot_state_publisher gazebo dynamixel navgraph-interactive \ -pddl-planner clips-executive +syncpoint-test \ +pddl-planner \ ++ clips-executive include $(BUILDSYSDIR)/rules.mk -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-pddl: 2 revs updated. (1.0.1-671-g1ee0ab3)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-pddl has been updated to 1ee0ab3855a7f86e86071d27b510df0fbc114042 (commit) via 7b7f73ff8591126b6ce4e68252b664cd5f298910 (commit) from d792f3ac2a0d0e81775c716acca96b11c08bdc56 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-pddl Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 1ee0ab3855a7f86e86071d27b510df0fbc114042 Merge: d792f3a 7b7f73f Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Jan 8 11:11:25 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Jan 8 11:11:25 2018 +0100 Merge remote-tracking branch 'origin/thofmann/tf-fix-faulty-bullet-optimization' into current-clips-executive-pddl http://git.fawkesrobotics.org/fawkes.git/commit/1ee0ab3 http://trac.fawkesrobotics.org/changeset/1ee0ab3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/libs/tf/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 1ee0ab3855a7f86e86071d27b510df0fbc114042 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Mon Jan 8 11:11:25 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/tf-fix-faulty-bullet-optimization' into current-clips-executive-pddl src/libs/tf/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 2 revs updated. (1.0.1-722-g6e71fc9)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 6e71fc9b10b55dd45cc2b9386811bd9d8cefe35c (commit) via 54ab137a9213e314c08d11e60df9a6e61f4aa628 (commit) from 56b91740f8cb78b6ac6ac93f72424e0f53d3affd (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 6e71fc9b10b55dd45cc2b9386811bd9d8cefe35c Merge: 56b9174 54ab137 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 16:58:07 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 16:58:07 2018 +0100 Merge remote-tracking branch 'origin/thofmann/clips-executive-maintenance-goals' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/6e71fc9 http://trac.fawkesrobotics.org/changeset/6e71fc9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/plan.clp |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 6e71fc9b10b55dd45cc2b9386811bd9d8cefe35c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Jan 11 16:58:07 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-maintenance-goals' into current-clips-executive-rcll src/plugins/clips-executive/clips/plan.clp |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 13 revs updated. (1.0.1-720-g56b9174)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, common/current-clips-executive-rcll has been updated
to 56b91740f8cb78b6ac6ac93f72424e0f53d3affd (commit)
via d9670b4da4bd474b2e71bac71473a7e46b08ac55 (commit)
via 2e0027273f350d954828bfb01f5f87ce8000a473 (commit)
via 16c88a7b9207c5209b8b8bb3fad971e3662d96b9 (commit)
via c1a370b227d25bac27e37500fae9460a441abcc1 (commit)
via 8ee8320d89d61311d097e27b437eb7dcd84d6a07 (commit)
via b84b65cba765a5452fcd3cc0700d9970f5fb8ca2 (commit)
via 510a8f736b78934fb9dd5bdd30c03a90b5db553b (commit)
via 26a16b68cf6b55ea4e18586134c31aff743fc0df (commit)
via 473aab477ebf5f1aa8681cde2e1f77231a96fb37 (commit)
via f7a87d25ff863cd516c9e192d82c14f1bf3d0dfa (commit)
via d85f0f6d730a612403ac87970986eaf04a498352 (commit)
via 133672adcad800d3a2ce81ce8a3e329519326ae2 (commit)
from 3f1d0651cbd7a1cc626c96e3b8431b831a5e344b (commit)
http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 56b91740f8cb78b6ac6ac93f72424e0f53d3affd
Merge: 3f1d065 d9670b4
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Thu Jan 11 16:57:18 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Thu Jan 11 16:57:18 2018 +0100
Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into
current-clips-executive-rcll
http://git.fawkesrobotics.org/fawkes.git/commit/56b9174
http://trac.fawkesrobotics.org/changeset/56b9174
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/Makefile |1 +
src/plugins/clips-executive/clips/domain.clp | 200 +++-
src/plugins/clips-executive/clips/plan.clp |2 +-
.../clips-executive/clips/robot-memory-sync.clp|1 +
.../clips-executive/clips/skills-actions.clp |2 +-
.../clips/test-scenario/action-selection.clp |2 +-
.../clips/test-scenario/goal-reasoner.clp |1 +
.../clips/test-scenario/test-domain.clp| 22 +++
.../clips-executive/clips/tests/blocksworld.clp|4 +-
.../conditional_say.clp} | 38 +++--
.../clips-executive/clips/tests/test_domain.cpp| 45 +
src/plugins/clips/pddl/precondition_visitor.cpp|2 +-
12 files changed, 249 insertions(+), 71 deletions(-)
copy src/plugins/clips-executive/clips/{test-scenario/problem-template.pddl =>
tests/conditional_say.clp} (50%)
- *Diffs* -
- *commit* 56b91740f8cb78b6ac6ac93f72424e0f53d3affd - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Thu Jan 11 16:57:18 2018 +0100
Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl'
into current-clips-executive-rcll
src/plugins/Makefile |1 +
src/plugins/clips-executive/clips/domain.clp | 200 +++-
src/plugins/clips-executive/clips/plan.clp |2 +-
.../clips-executive/clips/robot-memory-sync.clp|1 +
.../clips-executive/clips/skills-actions.clp |2 +-
.../clips/test-scenario/action-selection.clp |2 +-
.../clips/test-scenario/goal-reasoner.clp |1 +
.../clips/test-scenario/test-domain.clp| 22 +++
.../clips-executive/clips/tests/blocksworld.clp|4 +-
.../conditional_say.clp} | 38 +++--
.../clips-executive/clips/tests/test_domain.cpp| 45 +
src/plugins/clips/pddl/precondition_visitor.cpp|2 +-
12 files changed, 249 insertions(+), 71 deletions(-)
_Diff for modified files_:
diff --cc src/plugins/clips-executive/clips/domain.clp
index 215417c,de5d7ee..559871c
--- a/src/plugins/clips-executive/clips/domain.clp
+++ b/src/plugins/clips-executive/clips/domain.clp
@@@ -22,6 -22,10 +22,9 @@@
(deftemplate domain-predicate
"Representation of a predicate specification."
(slot name (type SYMBOL) (default ?NONE))
- (slot wm-key-pattern (type STRING))
+ ; If the predicate is sensed, it is not directly changed by an action
effect.
+ ; Instead, we expect the predicate to be changed externally.
+ (slot sensed (type SYMBOL) (allowed-values TRUE FALSE) (default FALSE))
(multislot param-names (type SYMBOL))
(multislot param-types (type SYMBOL))
)
diff --cc src/pl
[Fawkes Git] branch/common/current-clips-executive-rcll: 2 revs updated. (1.0.1-724-g9321095)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 9321095eb1c886065367e6f26a42549bee40b84a (commit) via 20d1fa8792633e7771896d6b770202d437b167fe (commit) from 6e71fc9b10b55dd45cc2b9386811bd9d8cefe35c (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 9321095eb1c886065367e6f26a42549bee40b84a Merge: 6e71fc9 20d1fa8 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 17:13:48 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 17:13:48 2018 +0100 Merge remote-tracking branch 'origin/mgomaa/clips-executive-tf-feature' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/9321095 http://trac.fawkesrobotics.org/changeset/9321095 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/init.clp | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 9321095eb1c886065367e6f26a42549bee40b84a - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Jan 11 17:13:48 2018 +0100 Subject: Merge remote-tracking branch 'origin/mgomaa/clips-executive-tf-feature' into current-clips-executive-rcll src/plugins/clips-executive/clips/init.clp | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 5 revs updated. (1.0.1-743-g55693a4)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 55693a4958937480deeda6188d379bcc941b (commit) via 8b55008da8e3fd16f7ef10a3b688a21af528a860 (commit) via ac9a47095011b6fd39242ca74dbeb001f981aa60 (commit) via 435de5aef81616e8dd3d568b75b8895f0cecb278 (commit) via 44cec6f9f814378f61c54c92e37a3ef7375a (commit) from 7c48d901be555f637dc34e8fbf66f7fa2e581e95 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 55693a4958937480deeda6188d379bcc941b Merge: 7c48d90 8b55008 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 19:00:24 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 19:00:24 2018 +0100 Merge remote-tracking branch 'remotes/origin/common/clips-executive-wm-config' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/55693a4 http://trac.fawkesrobotics.org/changeset/55693a4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- cfg/conf.d/clips-executive.yaml |7 src/plugins/clips-executive/clips/wm-config.clp | 38 +++--- src/plugins/clips/clips/utils.clp | 10 ++ 3 files changed, 29 insertions(+), 26 deletions(-) - *Diffs* - - *commit* 55693a4958937480deeda6188d379bcc941b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Jan 12 19:00:24 2018 +0100 Subject: Merge remote-tracking branch 'remotes/origin/common/clips-executive-wm-config' into current-clips-executive-rcll cfg/conf.d/clips-executive.yaml |7 src/plugins/clips-executive/clips/wm-config.clp | 38 +++--- src/plugins/clips/clips/utils.clp | 10 ++ 3 files changed, 29 insertions(+), 26 deletions(-) _Diff for modified files_: diff --cc src/plugins/clips-executive/clips/wm-config.clp index 36bb444,6a78913..d12a976 --- a/src/plugins/clips-executive/clips/wm-config.clp +++ b/src/plugins/clips-executive/clips/wm-config.clp @@@ -1,4 -1,4 +1,3 @@@ -- ;--- ; wm-config.clp - CLIPS executive ; -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 9 revs updated. (1.0.1-738-g7c48d90)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 7c48d901be555f637dc34e8fbf66f7fa2e581e95 (commit) via f126b81a51f342d65a470db08dc1970b651e9cfd (commit) via 849577f5b08524c0eae8c7fc4f37941e2db4f2b5 (commit) via ff62f47241f63c6fd5e3268ed8510fadd7f9 (commit) via 80d80ae9c8eec76a3c93d421895ac3a0e0826a14 (commit) via 36e8ed9a73fe26b9772956b80d4787fc8244da12 (commit) via e1c439e3b992dc023cd29db723a4c18135765cbd (commit) via 04c103e0614620c1a299576cc4984d3547e7f177 (commit) via ce44348ba8a89959c01a974012499e1a568e7115 (commit) from 94df9ef86f7f6ef69df4cc53355d692c31c7fdfa (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 36e8ed9a73fe26b9772956b80d4787fc8244da12 Merge: 94df9ef e1c439e Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 13:48:27 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 13:48:27 2018 +0100 Merge remote-tracking branch 'origin/timn/clips-executive-worldmodel' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/36e8ed9 http://trac.fawkesrobotics.org/changeset/36e8ed9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 80d80ae9c8eec76a3c93d421895ac3a0e0826a14 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 15:50:28 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 15:50:28 2018 +0100 clips: remember info about loaded paths This allows us to check whether a file was already loaded and which path it was loaded from. http://git.fawkesrobotics.org/fawkes.git/commit/80d80ae http://trac.fawkesrobotics.org/changeset/80d80ae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit ff62f47241f63c6fd5e35555268ed8510fadd7f9 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 15:52:05 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 18:55:36 2018 +0100 clips-executive: use path-info facts to guarantee right loading order http://git.fawkesrobotics.org/fawkes.git/commit/ff62f47 http://trac.fawkesrobotics.org/changeset/ff62f47 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 849577f5b08524c0eae8c7fc4f37941e2db4f2b5 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 15:52:44 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 18:55:36 2018 +0100 clips-executive: do not always clear robot-memory on init Instead of clearing robot-memory unconditionally in a rule that triggers on it, change the rule into a function that can be called by the domain-specific init handler. This way, we can clear robot memory on certain domain-specific conditions. http://git.fawkesrobotics.org/fawkes.git/commit/849577f http://trac.fawkesrobotics.org/changeset/849577f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f126b81a51f342d65a470db08dc1970b651e9cfd Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 18:51:16 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 18:55:36 2018 +0100 clips-executive: also sync domain-objects to robot-memory We only sync additions as we do not currently support/require deletion of domain objects. http://git.fawkesrobotics.org/fawkes.git/commit/f126b81 http://trac.fawkesrobotics.org/changeset/f126b81 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7c48d901be555f637dc34e8fbf66f7fa2e581e95 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 18:53:27 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 18:55:36 2018 +0100 clips-executive: fix outdated comment http://git.fawkesrobotics.org/fawkes.git/commit/7c48d90 http://trac.fawkesrobotics.org/changeset/7c48d90 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/init.clp |6 +- src/plugins/clips-executive/clips/pddl.clp |2 +- .../clips-executive/clips/robot-memory-
[Fawkes Git] branch/thofmann/robot-memory-pddl-duplicate-template-names: created (1.0.1-494-gd435294)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/robot-memory-pddl-duplicate-template-names has been created
at d43529416c07e5fad0096ade4113ec9de9296d12 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-pddl-duplicate-template-names
- *Log* ---
commit d43529416c07e5fad0096ade4113ec9de9296d12
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Thu Jan 11 21:38:34 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Thu Jan 11 21:44:36 2018 +0100
pddl-robot-memory: check for duplicate names in problem template
For each query in the problem template, we create a dictionary entry
with the template name as key and the result of the query as value.
If the same name is used twice in the template, then we create duplicate
entries in the resulting problem. To avoid this, remember all names and
their respective queries. If a name occurs again with the same query,
skip querying the database and use the result from the previous query.
If the queries are different, print an error message.
http://git.fawkesrobotics.org/fawkes.git/commit/d435294
http://trac.fawkesrobotics.org/changeset/d435294
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
- *Diffs* -
- *commit* d43529416c07e5fad0096ade4113ec9de9296d12 - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Thu Jan 11 21:38:34 2018 +0100
Subject: pddl-robot-memory: check for duplicate names in problem template
.../pddl-robot-memory/pddl_robot_memory_thread.cpp | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/pddl-robot-memory/pddl_robot_memory_thread.cpp
b/src/plugins/pddl-robot-memory/pddl_robot_memory_thread.cpp
index f288b1b..2c76485 100644
--- a/src/plugins/pddl-robot-memory/pddl_robot_memory_thread.cpp
+++ b/src/plugins/pddl-robot-memory/pddl_robot_memory_thread.cpp
@@ -113,6 +113,7 @@ PddlRobotMemoryThread::loop()
//find queries in template
size_t cur_pos = 0;
+ std::map<std::string, std::string> templates;
while(input.find("<<#", cur_pos) != std::string::npos)
{
cur_pos = input.find("<<#", cur_pos) + 3;
@@ -124,6 +125,18 @@ PddlRobotMemoryThread::loop()
//parse: template name | query
std::string template_name = input.substr(cur_pos, q_del_pos - cur_pos);
std::string query_str = input.substr(q_del_pos + 1, tpl_end_pos -
(q_del_pos + 1));
+if (templates.find(template_name) != templates.end()) {
+ if (templates[template_name] != query_str) {
+logger->log_error(name(),
+"Template with same name '%s' but different query '%s' vs '%s'!",
+template_name.c_str(), query_str.c_str(),
+templates[template_name].c_str());
+ } else {
+input.erase(q_del_pos, tpl_end_pos - q_del_pos);
+continue;
+ }
+}
+templates[template_name] = query_str;
//remove query stuff from input (its not part of the ctemplate features)
input.erase(q_del_pos, tpl_end_pos - q_del_pos);
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 3 revs updated. (1.0.1-727-g1613b1d)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 1613b1dabb43051cd93a34b0650ad551d908b079 (commit) via f494f1ec4c323a11e78a6d41d6dfc13583c5bfc0 (commit) via d43529416c07e5fad0096ade4113ec9de9296d12 (commit) from 9321095eb1c886065367e6f26a42549bee40b84a (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit f494f1ec4c323a11e78a6d41d6dfc13583c5bfc0 Merge: 9321095 d435294 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 21:46:29 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 21:46:29 2018 +0100 Merge remote-tracking branch 'origin/thofmann/robot-memory-pddl-duplicate-template-names' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/f494f1e http://trac.fawkesrobotics.org/changeset/f494f1e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1613b1dabb43051cd93a34b0650ad551d908b079 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 21:47:17 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 21:47:17 2018 +0100 clips executive: convert all action paramerts to upper case Instead of using all lower case, convert all action parameters to all upper case, as this matches the commonly used names better. http://git.fawkesrobotics.org/fawkes.git/commit/1613b1d http://trac.fawkesrobotics.org/changeset/1613b1d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp |2 +- .../pddl-robot-memory/pddl_robot_memory_thread.cpp | 13 + 2 files changed, 14 insertions(+), 1 deletions(-) - *Diffs* - - *commit* f494f1ec4c323a11e78a6d41d6dfc13583c5bfc0 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Jan 11 21:46:29 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-pddl-duplicate-template-names' into current-clips-executive-rcll .../pddl-robot-memory/pddl_robot_memory_thread.cpp | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) _Diff for modified files_: - *commit* 1613b1dabb43051cd93a34b0650ad551d908b079 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Jan 11 21:47:17 2018 +0100 Subject: clips executive: convert all action paramerts to upper case src/plugins/clips-executive/clips/pddl.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/pddl.clp b/src/plugins/clips-executive/clips/pddl.clp index 0fc32e5..da5c289 100644 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@ -102,7 +102,7 @@ (replace$ ?param-values ?param-index ?param-index - (sym-cat (lowcase ?param)) + (sym-cat (upcase ?param)) ) ) ) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 2 revs updated. (1.0.1-729-g94df9ef)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to 94df9ef86f7f6ef69df4cc53355d692c31c7fdfa (commit) via ca82101c1f5234bc6fea110aeec7d62efeea712a (commit) from 1613b1dabb43051cd93a34b0650ad551d908b079 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 94df9ef86f7f6ef69df4cc53355d692c31c7fdfa Merge: 1613b1d ca82101 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Jan 12 09:48:14 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Jan 12 09:48:14 2018 +0100 Merge remote-tracking branch 'origin/timn/robot-memory-aggregation-facet-query' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/94df9ef http://trac.fawkesrobotics.org/changeset/94df9ef - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../pddl-robot-memory/pddl_robot_memory_thread.cpp | 28 +++- 1 files changed, 27 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 94df9ef86f7f6ef69df4cc53355d692c31c7fdfa - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Jan 12 09:48:14 2018 +0100 Subject: Merge remote-tracking branch 'origin/timn/robot-memory-aggregation-facet-query' into current-clips-executive-rcll .../pddl-robot-memory/pddl_robot_memory_thread.cpp | 28 +++- 1 files changed, 27 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 2 revs updated. (1.0.1-753-gf20f4e8)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to f20f4e843509f9191170bc83ad7b4b95bb1d1716 (commit) via f1bd7e446b8aa9f5dd0d8013159eff59bb34e6ae (commit) from ba7b6f5797975b231affcdd13cb34d7477e77673 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit f20f4e843509f9191170bc83ad7b4b95bb1d1716 Merge: ba7b6f5 f1bd7e4 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Feb 2 12:39:54 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 2 12:39:54 2018 +0100 Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/f20f4e8 http://trac.fawkesrobotics.org/changeset/f20f4e8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp |9 - 1 files changed, 8 insertions(+), 1 deletions(-) - *Diffs* - - *commit* f20f4e843509f9191170bc83ad7b4b95bb1d1716 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Feb 2 12:39:54 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll src/plugins/clips-executive/clips/pddl.clp |9 - 1 files changed, 8 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-pddl: clips-executive: always use the min non-existing id for new actions
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-pddl has been updated to f1bd7e446b8aa9f5dd0d8013159eff59bb34e6ae (commit) from d9670b4da4bd474b2e71bac71473a7e46b08ac55 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-pddl Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit f1bd7e446b8aa9f5dd0d8013159eff59bb34e6ae Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Feb 2 12:37:46 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 2 12:37:46 2018 +0100 clips-executive: always use the min non-existing id for new actions Do not use the index of the action in the plan as action id, as this results in actions with the same IDs if you call the planner multiple times. Instead, check what the current max id is, and use the max id + 1 as new action ID. http://git.fawkesrobotics.org/fawkes.git/commit/f1bd7e4 http://trac.fawkesrobotics.org/changeset/f1bd7e4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp |9 - 1 files changed, 8 insertions(+), 1 deletions(-) - *Diffs* - - *commit* f1bd7e446b8aa9f5dd0d8013159eff59bb34e6ae - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Feb 2 12:37:46 2018 +0100 Subject: clips-executive: always use the min non-existing id for new actions src/plugins/clips-executive/clips/pddl.clp |9 - 1 files changed, 8 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/pddl.clp b/src/plugins/clips-executive/clips/pddl.clp index 0fc32e5..955e0b8 100644 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@ -82,6 +82,13 @@ (modify ?p (status PLANNED)) ) +(deffunction pddl-get-next-action-id () + "Get the ID of the next action, i.e., the max ID of all current actions + 1" + (bind ?i 1) + (do-for-all-facts ((?a plan-action)) (> ?a:id ?i) (bind ?i (+ 1 ?a:id))) + (return ?i) +) + (defrule pddl-expand-goal "Fetch the resulting plan from robot memory and expand the goal." ?g <- (goal (id ?goal-id) (mode SELECTED)) @@ -109,7 +116,7 @@ (assert (plan (id ?plan-id) (goal-id ?goal-id)) (plan-action -(id ?action-index) +(id (pddl-get-next-action-id)) (plan-id ?plan-id) (action-name (sym-cat (bson-get ?action "name"))) (param-values ?param-values) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 8 revs updated. (1.0.1-751-gba7b6f5)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to ba7b6f5797975b231affcdd13cb34d7477e77673 (commit) via 6d0873e43ec3fe27b7b3d9c9fd1af5618ae72624 (commit) via 1ead15efcd672063049e176b8b2a9768be5b43a3 (commit) via 2fae36f8364a454ab95d90a1ca8aa646f8ca15d1 (commit) via 4dd3fa7c65519091268a808f97c2e7e6bf81953d (commit) via f51cef16f43fbaea7f01b4b6639944b0947a4880 (commit) via c984d24d8f6dd6123274ab6656d8952ce313df0b (commit) via 9a1c13fbb0c5992eee4dc8ed272e4c79fe7dd3ab (commit) from 55693a4958937480deeda6188d379bcc941b (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit ba7b6f5797975b231affcdd13cb34d7477e77673 Merge: 55693a4 6d0873e Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Jan 30 11:20:02 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Jan 30 11:20:02 2018 +0100 Merge remote-tracking branch 'origin/timn/clips-executive-pddl-fix' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/ba7b6f5 http://trac.fawkesrobotics.org/changeset/ba7b6f5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/domain.clp | 105 +++- src/plugins/clips-executive/clips/plan.clp |2 +- .../clips-executive/clips/skills-actions.clp |4 +- .../clips/test-scenario/test-domain.clp|4 +- .../clips-executive/clips/tests/blocksworld.clp| 37 --- .../clips/tests/conditional_say.clp|4 +- .../clips-executive/clips/tests/test_domain.cpp|3 + 7 files changed, 90 insertions(+), 69 deletions(-) - *Diffs* - - *commit* ba7b6f5797975b231affcdd13cb34d7477e77673 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Tue Jan 30 11:20:02 2018 +0100 Subject: Merge remote-tracking branch 'origin/timn/clips-executive-pddl-fix' into current-clips-executive-rcll src/plugins/clips-executive/clips/domain.clp | 105 +++- src/plugins/clips-executive/clips/plan.clp |2 +- .../clips-executive/clips/skills-actions.clp |4 +- .../clips/test-scenario/test-domain.clp|4 +- .../clips-executive/clips/tests/blocksworld.clp| 37 --- .../clips/tests/conditional_say.clp|4 +- .../clips-executive/clips/tests/test_domain.cpp|3 + 7 files changed, 90 insertions(+), 69 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-pddl: 2 revs updated. (1.0.1-547-gf45c129)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-pddl has been updated to f45c12972fdc98e653a34ebff1aafb25ec3d68b1 (commit) via 273ae9b1df3d6c474e57b72327d8931439c3e7ad (commit) from 026f3d380f7e18ba44def880257ada8fe21dc422 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-pddl Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 273ae9b1df3d6c474e57b72327d8931439c3e7ad Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 21:47:17 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 9 11:46:38 2018 +0100 clips executive: convert all action parameters to upper case Instead of using all lower case, convert all action parameters to all upper case, as this matches the commonly used names better. http://git.fawkesrobotics.org/fawkes.git/commit/273ae9b http://trac.fawkesrobotics.org/changeset/273ae9b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f45c12972fdc98e653a34ebff1aafb25ec3d68b1 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Feb 9 11:39:04 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 9 11:46:46 2018 +0100 clips-executive: ignore REACH-GOAL action returned by the PDDL planner FF sometimes adds a REACH-GOAL action as last action to the plan. This is a pseudo-action that we never need, directly filter it out. http://git.fawkesrobotics.org/fawkes.git/commit/f45c129 http://trac.fawkesrobotics.org/changeset/f45c129 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp | 38 +++ 1 files changed, 21 insertions(+), 17 deletions(-) - *Diffs* - - *commit* 273ae9b1df3d6c474e57b72327d8931439c3e7ad - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Jan 11 21:47:17 2018 +0100 Subject: clips executive: convert all action parameters to upper case src/plugins/clips-executive/clips/pddl.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/pddl.clp b/src/plugins/clips-executive/clips/pddl.clp index c0158c1..21fc1cb 100644 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@ -110,7 +110,7 @@ (replace$ ?param-values ?param-index ?param-index - (sym-cat (lowcase ?param)) + (sym-cat (upcase ?param)) ) ) ) - *commit* f45c12972fdc98e653a34ebff1aafb25ec3d68b1 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Feb 9 11:39:04 2018 +0100 Subject: clips-executive: ignore REACH-GOAL action returned by the PDDL planner src/plugins/clips-executive/clips/pddl.clp | 38 +++ 1 files changed, 21 insertions(+), 17 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/pddl.clp b/src/plugins/clips-executive/clips/pddl.clp index 21fc1cb..a543fe4 100644 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@ -103,24 +103,28 @@ (printout t "Fetched a new plan!" crlf) (bind ?id-offset (pddl-get-max-action-id)) (progn$ (?action (bson-get-array (bson-get ?obj "o") "actions")) -(bind ?param-values (bson-get-array ?action "args")) -; Convert all paramters to lower-case symbols -(progn$ (?param ?param-values) - (bind ?param-values -(replace$ - ?param-values - ?param-index ?param-index - (sym-cat (upcase ?param)) -) +(bind ?action-name (sym-cat (bson-get ?action "name"))) +; FF sometimes returns the pseudo-action REACH-GOAL. Filter it out. +(if (neq ?action-name REACH-GOAL) then + (bind ?param-values (bson-get-array ?action "args")) + ; Convert all parameters to upper-case symbols + (progn$ (?param ?param-values) +(bind ?param-values + (replace$ +?param-values +?param-index ?param-index +(sym-cat (upcase ?param)) + ) +) ) -) -(assert - (plan (id ?plan-id) (go
[Fawkes Git] branch/common/current-clips-executive-rcll: 3 revs updated. (1.0.1-758-gd4dae4e)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to d4dae4ef1ea664d20db1482f77a4647a34f3cb2c (commit) via f45c12972fdc98e653a34ebff1aafb25ec3d68b1 (commit) via 273ae9b1df3d6c474e57b72327d8931439c3e7ad (commit) from a9ee5d7ba8da957a3f91eb0b05b418d372e2cfdc (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit d4dae4ef1ea664d20db1482f77a4647a34f3cb2c Merge: a9ee5d7 f45c129 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Feb 9 11:50:04 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 9 11:50:04 2018 +0100 Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/d4dae4e http://trac.fawkesrobotics.org/changeset/d4dae4e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp | 38 +++ 1 files changed, 21 insertions(+), 17 deletions(-) - *Diffs* - - *commit* d4dae4ef1ea664d20db1482f77a4647a34f3cb2c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Feb 9 11:50:04 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll src/plugins/clips-executive/clips/pddl.clp | 38 +++ 1 files changed, 21 insertions(+), 17 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 2 revs updated. (1.0.1-755-ga9ee5d7)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to a9ee5d7ba8da957a3f91eb0b05b418d372e2cfdc (commit) via 026f3d380f7e18ba44def880257ada8fe21dc422 (commit) from f20f4e843509f9191170bc83ad7b4b95bb1d1716 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit a9ee5d7ba8da957a3f91eb0b05b418d372e2cfdc Merge: f20f4e8 026f3d3 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Feb 9 11:27:18 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 9 11:27:18 2018 +0100 Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll http://git.fawkesrobotics.org/fawkes.git/commit/a9ee5d7 http://trac.fawkesrobotics.org/changeset/a9ee5d7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) - *Diffs* - - *commit* a9ee5d7ba8da957a3f91eb0b05b418d372e2cfdc - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Feb 9 11:27:18 2018 +0100 Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into current-clips-executive-rcll src/plugins/clips-executive/clips/pddl.clp | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) _Diff for modified files_: diff --cc src/plugins/clips-executive/clips/pddl.clp index e7dde09,c0158c1..1f18419 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@@ -101,9 -101,10 +101,10 @@@ ) => (printout t "Fetched a new plan!" crlf) + (bind ?id-offset (pddl-get-max-action-id)) (progn$ (?action (bson-get-array (bson-get ?obj "o") "actions")) (bind ?param-values (bson-get-array ?action "args")) -; Convert all paramters to lower-case symbols +; Convert all paramters to upper-case symbols (progn$ (?param ?param-values) (bind ?param-values (replace$ -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-pddl: clips-executive: fix action IDs for PDDL actions
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-pddl has been updated to 026f3d380f7e18ba44def880257ada8fe21dc422 (commit) from f1bd7e446b8aa9f5dd0d8013159eff59bb34e6ae (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-pddl Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 026f3d380f7e18ba44def880257ada8fe21dc422 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Feb 9 11:18:16 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Feb 9 11:26:02 2018 +0100 clips-executive: fix action IDs for PDDL actions The last method did not work because the plan-action fact was not asserted yet before adding the next action, which resulted in same action IDs for all actions in a plan. Now, get the highest existing action ID only once as offset for the action IDs. Set the final action ID to the sum of the offset and the action ID in the plan. http://git.fawkesrobotics.org/fawkes.git/commit/026f3d3 http://trac.fawkesrobotics.org/changeset/026f3d3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) - *Diffs* - - *commit* 026f3d380f7e18ba44def880257ada8fe21dc422 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Feb 9 11:18:16 2018 +0100 Subject: clips-executive: fix action IDs for PDDL actions src/plugins/clips-executive/clips/pddl.clp | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/pddl.clp b/src/plugins/clips-executive/clips/pddl.clp index 955e0b8..c0158c1 100644 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@ -82,10 +82,10 @@ (modify ?p (status PLANNED)) ) -(deffunction pddl-get-next-action-id () - "Get the ID of the next action, i.e., the max ID of all current actions + 1" - (bind ?i 1) - (do-for-all-facts ((?a plan-action)) (> ?a:id ?i) (bind ?i (+ 1 ?a:id))) +(deffunction pddl-get-max-action-id () + "Get the max ID of all current action" + (bind ?i 0) + (do-for-all-facts ((?a plan-action)) (> ?a:id ?i) (bind ?i ?a:id)) (return ?i) ) @@ -101,6 +101,7 @@ ) => (printout t "Fetched a new plan!" crlf) + (bind ?id-offset (pddl-get-max-action-id)) (progn$ (?action (bson-get-array (bson-get ?obj "o") "actions")) (bind ?param-values (bson-get-array ?action "args")) ; Convert all paramters to lower-case symbols @@ -116,7 +117,7 @@ (assert (plan (id ?plan-id) (goal-id ?goal-id)) (plan-action -(id (pddl-get-next-action-id)) +(id (+ ?action-index ?id-offset)) (plan-id ?plan-id) (action-name (sym-cat (bson-get ?action "name"))) (param-values ?param-values) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: 2 revs updated. (1.0.1-760-g4f1c14b)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, common/current-clips-executive-rcll has been updated
to 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d (commit)
via f5161226b2af48ae0d54d99e6e099ddec6253f73 (commit)
from d4dae4ef1ea664d20db1482f77a4647a34f3cb2c (commit)
http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d
Merge: d4dae4e f516122
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Thu Feb 22 13:00:12 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Thu Feb 22 13:00:12 2018 +0100
Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl' into
current-clips-executive-rcll
http://git.fawkesrobotics.org/fawkes.git/commit/4f1c14b
http://trac.fawkesrobotics.org/changeset/4f1c14b
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/Makefile |7 ++--
src/plugins/clips-executive/clips/init.clp |2 +-
.../{clips-agent => clips-pddl-parser}/Makefile| 30 +++---
.../clips_pddl_parser_feature.cpp} | 10 +++---
.../clips_pddl_parser_feature.h} |8 ++--
.../clips_pddl_parser_plugin.cpp} | 29 +-
.../clips_pddl_parser_thread.cpp} | 27 +
.../clips_pddl_parser_thread.h}| 31 +++
.../pddl => clips-pddl-parser}/effect_visitor.cpp |0
.../pddl => clips-pddl-parser}/effect_visitor.h|6 ++--
.../precondition_visitor.cpp |0
.../precondition_visitor.h |6 ++--
src/plugins/clips/Makefile |5 +--
src/plugins/clips/clips_thread.cpp |2 -
14 files changed, 68 insertions(+), 95 deletions(-)
copy src/plugins/{clips-agent => clips-pddl-parser}/Makefile (51%)
rename src/plugins/{clips/feature_pddl.cpp =>
clips-pddl-parser/clips_pddl_parser_feature.cpp} (95%)
rename src/plugins/{clips/feature_pddl.h =>
clips-pddl-parser/clips_pddl_parser_feature.h} (87%)
copy src/plugins/{amcl/map_lasergen_plugin.cpp =>
clips-pddl-parser/clips_pddl_parser_plugin.cpp} (58%)
copy src/{tools/ffinfo/ffinfo.cpp =>
plugins/clips-pddl-parser/clips_pddl_parser_thread.cpp} (63%)
copy src/plugins/{syncpoint-test/test_thread.h =>
clips-pddl-parser/clips_pddl_parser_thread.h} (62%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/effect_visitor.cpp (100%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/effect_visitor.h (89%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/precondition_visitor.cpp
(100%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/precondition_visitor.h
(88%)
- *Diffs* -
- *commit* 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Thu Feb 22 13:00:12 2018 +0100
Subject: Merge remote-tracking branch 'origin/thofmann/clips-executive-pddl'
into current-clips-executive-rcll
src/plugins/Makefile |7 ++--
src/plugins/clips-executive/clips/init.clp |2 +-
.../{clips-agent => clips-pddl-parser}/Makefile| 30 +++---
.../clips_pddl_parser_feature.cpp} | 10 +++---
.../clips_pddl_parser_feature.h} |8 ++--
.../clips_pddl_parser_plugin.cpp} | 29 +-
.../clips_pddl_parser_thread.cpp} | 27 +
.../clips_pddl_parser_thread.h}| 31 +++
.../pddl => clips-pddl-parser}/effect_visitor.cpp |0
.../pddl => clips-pddl-parser}/effect_visitor.h|6 ++--
.../precondition_visitor.cpp |0
.../precondition_visitor.h |6 ++--
src/plugins/clips/Makefile |5 +--
src/plugins/clips/clips_thread.cpp |2 -
14 files changed, 68 insertions(+), 95 deletions(-)
_Diff for modified files_:
diff --cc src/plugins/Makefile
index 557aa44,ec3b722..6ab4767
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@@ -24,13 -24,12 +24,14 @@@ SUBDIRS= bbsync bblogger webview ttmai
skiller l
[Fawkes Git] branch/thofmann/clips-executive-pddl: clips: split clips-pddl-parser into a separate plugin
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/clips-executive-pddl has been updated
to f5161226b2af48ae0d54d99e6e099ddec6253f73 (commit)
from f45c12972fdc98e653a34ebff1aafb25ec3d68b1 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-pddl
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit f5161226b2af48ae0d54d99e6e099ddec6253f73
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Mon Feb 19 09:45:53 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Mon Feb 19 16:19:30 2018 +0100
clips: split clips-pddl-parser into a separate plugin
The feature is now provided by a separate plugin, so we only need to
load it if we actually need it. Also rename the feature from pddl to
pddl-parser to distinguish it from the PDDL planning code.
http://git.fawkesrobotics.org/fawkes.git/commit/f516122
http://trac.fawkesrobotics.org/changeset/f516122
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/Makefile |7 ++--
src/plugins/clips-executive/clips/init.clp |2 +-
.../{clips-agent => clips-pddl-parser}/Makefile| 30 +++---
.../clips_pddl_parser_feature.cpp} | 10 +++---
.../clips_pddl_parser_feature.h} |8 ++--
.../clips_pddl_parser_plugin.cpp} | 29 -
.../clips_pddl_parser_thread.cpp} | 27 +---
.../clips_pddl_parser_thread.h}| 33 ---
.../pddl => clips-pddl-parser}/effect_visitor.cpp |0
.../pddl => clips-pddl-parser}/effect_visitor.h|6 ++--
.../precondition_visitor.cpp |0
.../precondition_visitor.h |6 ++--
src/plugins/clips/Makefile |5 +--
src/plugins/clips/clips_thread.cpp |2 -
14 files changed, 70 insertions(+), 95 deletions(-)
copy src/plugins/{clips-agent => clips-pddl-parser}/Makefile (51%)
rename src/plugins/{clips/feature_pddl.cpp =>
clips-pddl-parser/clips_pddl_parser_feature.cpp} (95%)
rename src/plugins/{clips/feature_pddl.h =>
clips-pddl-parser/clips_pddl_parser_feature.h} (87%)
copy src/plugins/{amcl/map_lasergen_plugin.cpp =>
clips-pddl-parser/clips_pddl_parser_plugin.cpp} (58%)
copy src/{tools/ffinfo/ffinfo.cpp =>
plugins/clips-pddl-parser/clips_pddl_parser_thread.cpp} (63%)
copy src/plugins/{skiller/skiller_feature.h =>
clips-pddl-parser/clips_pddl_parser_thread.h} (59%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/effect_visitor.cpp (100%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/effect_visitor.h (89%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/precondition_visitor.cpp
(100%)
rename src/plugins/{clips/pddl => clips-pddl-parser}/precondition_visitor.h
(88%)
- *Diffs* -
- *commit* f5161226b2af48ae0d54d99e6e099ddec6253f73 - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Mon Feb 19 09:45:53 2018 +0100
Subject: clips: split clips-pddl-parser into a separate plugin
src/plugins/Makefile |7 ++--
src/plugins/clips-executive/clips/init.clp |2 +-
.../{clips-agent => clips-pddl-parser}/Makefile| 30 +++---
.../clips_pddl_parser_feature.cpp} | 10 +++---
.../clips_pddl_parser_feature.h} |8 ++--
.../clips_pddl_parser_plugin.cpp} | 29 -
.../clips_pddl_parser_thread.cpp} | 27 +---
.../clips_pddl_parser_thread.h}| 33 ---
.../pddl => clips-pddl-parser}/effect_visitor.cpp |0
.../pddl => clips-pddl-parser}/effect_visitor.h|6 ++--
.../precondition_visitor.cpp |0
.../precondition_visitor.h |6 ++--
src/plugins/clips/Makefile |5 +--
src/plugins/clips/clips_thread.cpp |2 -
14 files changed, 70 insertions(+), 95 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index 39c624f..ec3b722 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -24,8 +24,9 @@ SUBDIRS = bbsync bblogger webview ttmainloop rrd rrd
[Fawkes Git] branch/thofmann/clips-executive-pddl: lib pddl parser: add missing documentation
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/clips-executive-pddl has been updated
discards 40651b6d0df161b7cc372574455a2cf061884ebf (commit)
to 0be8be919f9368c1958cadb7b67814e273bb99e3 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (40651b6d0df161b7cc372574455a2cf061884ebf)
\
N -- N -- N (0be8be919f9368c1958cadb7b67814e273bb99e3)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-pddl
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 0be8be919f9368c1958cadb7b67814e273bb99e3
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Mon Feb 26 14:24:47 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Mon Feb 26 18:10:33 2018 +0100
lib pddl parser: add missing documentation
http://git.fawkesrobotics.org/fawkes.git/commit/0be8be9
http://trac.fawkesrobotics.org/changeset/0be8be9
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
- *Diffs* -
- *commit* 0be8be919f9368c1958cadb7b67814e273bb99e3 - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Mon Feb 26 14:24:47 2018 +0100
Subject: lib pddl parser: add missing documentation
src/libs/pddl_parser/pddl_parser.h |4
1 files changed, 4 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/src/libs/pddl_parser/pddl_parser.h
b/src/libs/pddl_parser/pddl_parser.h
index 879b6ba..1535bc7 100644
--- a/src/libs/pddl_parser/pddl_parser.h
+++ b/src/libs/pddl_parser/pddl_parser.h
@@ -50,6 +50,10 @@ class PddlParserException : public fawkes::Exception
*/
PddlParserException(const char *msg)
: fawkes::Exception(msg) {}
+ /** Constructor with a string message.
+ * This wraps the constructor with a char* message for usage with
std::string.
+ * @param msg A message describing the error.
+ */
PddlParserException(const std::string )
: fawkes::Exception(msg.c_str()) {}
};
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-renewal-succeeded-but-lock-expired: created (1.0.1-1438-g9ae7ed5)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/robot-memory-renewal-succeeded-but-lock-expired has been created at 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-renewal-succeeded-but-lock-expired - *Log* --- commit 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 Author: Till Hofmann AuthorDate: Tue Jun 19 01:11:37 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 01:11:37 2018 -0400 clips-executive: deal with renewed but expired locks For some reason, a lock renewal request can succeed (response ACQUIRED), but the lock has already been expired and is OPEN. In this case, ignore the response and treat the lock as if it was lost. http://git.fawkesrobotics.org/fawkes.git/commit/9ae7ed5 http://trac.fawkesrobotics.org/changeset/9ae7ed5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 - - - - - - - - - - Author: Till Hofmann Date:Tue Jun 19 01:11:37 2018 -0400 Subject: clips-executive: deal with renewed but expired locks .../clips-executive/clips/coordination-mutex.clp | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp b/src/plugins/clips-executive/clips/coordination-mutex.clp index 19b332c..3b8aadb 100644 --- a/src/plugins/clips-executive/clips/coordination-mutex.clp +++ b/src/plugins/clips-executive/clips/coordination-mutex.clp @@ -387,6 +387,16 @@ (modify ?mf (request NONE) (response NONE) (pending-requests ?pending-requests)) ) +(defrule mutex-lock-auto-renew-done-but-lock-open + ?mf <- (mutex (name ?name) (state OPEN) + (request RENEW-LOCK) (response ACQUIRED) + (pending-requests AUTO-RENEW-PROC $?pending-requests)) + => + (printout error "Renewed " ?name " but lock has expired in the meantime. " + "LOST LOCK!" crlf) + (modify ?mf (request NONE) (response NONE) (pending-requests ?pending-request)) +) + (defrule mutex-lock-auto-renew-failed ?mf <- (mutex (name ?name) (state LOCKED) (request RENEW-LOCK) (response REJECTED) (locked-by ?lb) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1439-g633d043)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 633d043c83d4d94537e175c0c7391f9d97f1e49a (commit) via 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 (commit) from c0be9e79400155847ae1d38c90b8b37927e52a9f (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 633d043c83d4d94537e175c0c7391f9d97f1e49a Merge: c0be9e7 9ae7ed5 Author: Till Hofmann AuthorDate: Tue Jun 19 01:13:43 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 01:13:43 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-renewal-succeeded-but-lock-expired' into current http://git.fawkesrobotics.org/fawkes.git/commit/633d043 http://trac.fawkesrobotics.org/changeset/633d043 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) - *Diffs* - - *commit* 633d043c83d4d94537e175c0c7391f9d97f1e49a - - - - - - - - - - Author: Till Hofmann Date:Tue Jun 19 01:13:43 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-renewal-succeeded-but-lock-expired' into current .../clips-executive/clips/coordination-mutex.clp | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/labrpxlr4/rcll-cluster: created (1.0.1-771-gbcc5ae3)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, labrpxlr4/rcll-cluster has been created
at bcc5ae3285cb1fbd57b60c9e7741c1f9a4013078 (commit)
http://git.fawkesrobotics.org/fawkes.git/labrpxlr4/rcll-cluster
- *Log* ---
commit 9a842f228ee4e22c0e77c5d9ec410905cffb946d
Author: Till Hofmann
AuthorDate: Thu Jul 5 17:49:49 2018 +0200
Commit: Till Hofmann
CommitDate: Thu Jul 5 17:49:49 2018 +0200
robot-memory: make instance management optional
http://git.fawkesrobotics.org/fawkes.git/commit/9a842f2
http://trac.fawkesrobotics.org/changeset/9a842f2
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit bcc5ae3285cb1fbd57b60c9e7741c1f9a4013078
Author: Till Hofmann
AuthorDate: Thu Jul 5 17:50:12 2018 +0200
Commit: Till Hofmann
CommitDate: Thu Jul 5 17:50:12 2018 +0200
config: do not manage mongodb instances
http://git.fawkesrobotics.org/fawkes.git/commit/bcc5ae3
http://trac.fawkesrobotics.org/changeset/bcc5ae3
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
cfg/conf.d/robot-memory.yaml |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
- *Diffs* -
- *commit* 9a842f228ee4e22c0e77c5d9ec410905cffb946d - - - - - - - - - -
Author: Till Hofmann
Date:Thu Jul 5 17:49:49 2018 +0200
Subject: robot-memory: make instance management optional
src/plugins/robot-memory/robot_memory_setup.cpp |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/robot_memory_setup.cpp
b/src/plugins/robot-memory/robot_memory_setup.cpp
index 6df547a..c79b9b0 100644
--- a/src/plugins/robot-memory/robot_memory_setup.cpp
+++ b/src/plugins/robot-memory/robot_memory_setup.cpp
@@ -57,6 +57,13 @@ RobotMemorySetup::~RobotMemorySetup()
*/
void RobotMemorySetup::setup_mongods()
{
+ bool manage_instances = true;
+ try {
+bool manage_instances =
config->get_bool("plugins/robot-memory/setup/manage-instances");
+ } catch (Exception ) {}
+ if (!manage_instances) {
+return;
+ }
std::string log_path =
config->get_string("plugins/robot-memory/setup/log-path");
prepare_mongo_db_path(log_path);
- *commit* bcc5ae3285cb1fbd57b60c9e7741c1f9a4013078 - - - - - - - - - -
Author: Till Hofmann
Date:Thu Jul 5 17:50:12 2018 +0200
Subject: config: do not manage mongodb instances
cfg/conf.d/robot-memory.yaml |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/cfg/conf.d/robot-memory.yaml b/cfg/conf.d/robot-memory.yaml
index a68563a..470088a 100644
--- a/cfg/conf.d/robot-memory.yaml
+++ b/cfg/conf.d/robot-memory.yaml
@@ -14,6 +14,7 @@ plugins/robot-memory:
distributed-db-names: ["syncedrobmem"]
setup:
+manage-instances: false
# When fawkes starts mongod, it might need some time to initialize the db
(especially the first time)
max_setup_time: 6000
# The mongo client conntections to use for the robot memory. Defined below
in plugins/mongodb/clients
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/labrpxlr4/rcll-cluster: 2 revs updated. (1.0.1-771-g55e11fe)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, labrpxlr4/rcll-cluster has been updated
discards bcc5ae3285cb1fbd57b60c9e7741c1f9a4013078 (commit)
discards 9a842f228ee4e22c0e77c5d9ec410905cffb946d (commit)
to 55e11fe0afc8a264c038769805844d9e168d4791 (commit)
via e2cb051c8292ec262bcffd37e47b8de6c72e6aa1 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (bcc5ae3285cb1fbd57b60c9e7741c1f9a4013078)
\
N -- N -- N (55e11fe0afc8a264c038769805844d9e168d4791)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
http://git.fawkesrobotics.org/fawkes.git/labrpxlr4/rcll-cluster
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit e2cb051c8292ec262bcffd37e47b8de6c72e6aa1
Author: Till Hofmann
AuthorDate: Thu Jul 5 17:49:49 2018 +0200
Commit: Till Hofmann
CommitDate: Thu Jul 5 17:58:07 2018 +0200
robot-memory: make instance management optional
http://git.fawkesrobotics.org/fawkes.git/commit/e2cb051
http://trac.fawkesrobotics.org/changeset/e2cb051
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 55e11fe0afc8a264c038769805844d9e168d4791
Author: Till Hofmann
AuthorDate: Thu Jul 5 17:50:12 2018 +0200
Commit: Till Hofmann
CommitDate: Thu Jul 5 17:58:07 2018 +0200
config: do not manage mongodb instances
http://git.fawkesrobotics.org/fawkes.git/commit/55e11fe
http://trac.fawkesrobotics.org/changeset/55e11fe
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/robot-memory/robot_memory_setup.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
- *Diffs* -
- *commit* e2cb051c8292ec262bcffd37e47b8de6c72e6aa1 - - - - - - - - - -
Author: Till Hofmann
Date:Thu Jul 5 17:49:49 2018 +0200
Subject: robot-memory: make instance management optional
src/plugins/robot-memory/robot_memory_setup.cpp |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/robot-memory/robot_memory_setup.cpp
b/src/plugins/robot-memory/robot_memory_setup.cpp
index 6df547a..955daa9 100644
--- a/src/plugins/robot-memory/robot_memory_setup.cpp
+++ b/src/plugins/robot-memory/robot_memory_setup.cpp
@@ -57,6 +57,13 @@ RobotMemorySetup::~RobotMemorySetup()
*/
void RobotMemorySetup::setup_mongods()
{
+ bool manage_instances = true;
+ try {
+manage_instances =
config->get_bool("plugins/robot-memory/setup/manage-instances");
+ } catch (Exception ) {}
+ if (!manage_instances) {
+return;
+ }
std::string log_path =
config->get_string("plugins/robot-memory/setup/log-path");
prepare_mongo_db_path(log_path);
- *commit* 55e11fe0afc8a264c038769805844d9e168d4791 - - - - - - - - - -
Author: Till Hofmann
Date:Thu Jul 5 17:50:12 2018 +0200
Subject: config: do not manage mongodb instances
cfg/conf.d/robot-memory.yaml |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/cfg/conf.d/robot-memory.yaml b/cfg/conf.d/robot-memory.yaml
index a68563a..470088a 100644
--- a/cfg/conf.d/robot-memory.yaml
+++ b/cfg/conf.d/robot-memory.yaml
@@ -14,6 +14,7 @@ plugins/robot-memory:
distributed-db-names: ["syncedrobmem"]
setup:
+manage-instances: false
# When fawkes starts mongod, it might need some time to initialize the db
(especially the first time)
max_setup_time: 6000
# The mongo client conntections to use for the robot memory. Defined below
in plugins/mongodb/clients
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/labrpxlr4/rcll-cluster:
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, labrpxlr4/rcll-cluster has been updated discards 55e11fe0afc8a264c038769805844d9e168d4791 (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (e2cb051c8292ec262bcffd37e47b8de6c72e6aa1) \ O -- O -- O (55e11fe0afc8a264c038769805844d9e168d4791) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. http://git.fawkesrobotics.org/fawkes.git/labrpxlr4/rcll-cluster No new revisions were added by this update. - *Summary* --- cfg/conf.d/robot-memory.yaml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) - *Diffs* - -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/labrpxlr4/rcll-cluster: plugins: add missing dependency of clips-executive on clips
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, labrpxlr4/rcll-cluster has been updated to 7aa404131a3570364f1871c1faada9dba065b228 (commit) from e2cb051c8292ec262bcffd37e47b8de6c72e6aa1 (commit) http://git.fawkesrobotics.org/fawkes.git/labrpxlr4/rcll-cluster Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 7aa404131a3570364f1871c1faada9dba065b228 Author: Till Hofmann AuthorDate: Fri Jul 6 11:45:55 2018 +0200 Commit: Till Hofmann CommitDate: Fri Jul 6 11:45:55 2018 +0200 plugins: add missing dependency of clips-executive on clips http://git.fawkesrobotics.org/fawkes.git/commit/7aa4041 http://trac.fawkesrobotics.org/changeset/7aa4041 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 7aa404131a3570364f1871c1faada9dba065b228 - - - - - - - - - - Author: Till Hofmann Date:Fri Jul 6 11:45:55 2018 +0200 Subject: plugins: add missing dependency of clips-executive on clips src/plugins/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/Makefile b/src/plugins/Makefile index 6ab4767..8500038 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -42,7 +42,7 @@ katana jaco: openrave amcl colli laser-lines navgraph navgraph-generator navgraph-interactive perception robotino: ros mongodb_log: mongodb mongodb: rrd -clips-navgraph clips-agent clips-pddl-parser clips-protobuf clips-tf clips-robot-memory: clips +clips-navgraph clips-agent clips-executive clips-pddl-parser clips-protobuf clips-tf clips-robot-memory: clips clips-navgraph navgraph-clusters: navgraph clips-webview: clips webview clips-ros: clips ros -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 9 revs updated. (1.0.1-1448-gf6f56eb)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to f6f56eb1653a253e59b0f1866607ff3de0c61028 (commit) via 2ab6397468e03b8481e2bd6c7f1cf0f317edb7a1 (commit) via 774e1a6ed394da3593d563345e4d433d01117c4b (commit) via f8669b51b331334a2522e5224d332aaf91be5387 (commit) via 8da89a2c83f5b572dc4cef2cb2c2b07de694221a (commit) via 3174aee196e951aba26d633b1fc6bd1df6cc0d93 (commit) via d8061bf3ad52fd693d30b6fe113d795b404424f4 (commit) via 97c71b2e6159fd9c125784e69047de9f007516cc (commit) via fb6eae30219a5d253ead96ae064252459f4e4ffd (commit) from a50d85f1c3ba7403ba3616e8c473c13ecab84f4d (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit fb6eae30219a5d253ead96ae064252459f4e4ffd Author: Till Hofmann AuthorDate: Tue Jun 19 15:24:49 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 15:24:49 2018 -0400 mainapp: send warnings about looptime to debug log, do not warn http://git.fawkesrobotics.org/fawkes.git/commit/fb6eae3 http://trac.fawkesrobotics.org/changeset/fb6eae3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 97c71b2e6159fd9c125784e69047de9f007516cc Author: Till Hofmann AuthorDate: Tue Jun 19 15:25:11 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 15:25:11 2018 -0400 syncpoint: send warnings about timeouts to debug log, do not warn http://git.fawkesrobotics.org/fawkes.git/commit/97c71b2 http://trac.fawkesrobotics.org/changeset/97c71b2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d8061bf3ad52fd693d30b6fe113d795b404424f4 Merge: a50d85f 97c71b2 Author: Till Hofmann AuthorDate: Tue Jun 19 15:26:20 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 15:26:20 2018 -0400 Merge remote-tracking branch 'origin/thofmann/mute-looptime-warnings' into current http://git.fawkesrobotics.org/fawkes.git/commit/d8061bf http://trac.fawkesrobotics.org/changeset/d8061bf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3174aee196e951aba26d633b1fc6bd1df6cc0d93 Author: Till Hofmann AuthorDate: Wed Jun 20 16:52:09 2018 -0400 Commit: Till Hofmann CommitDate: Wed Jun 20 16:52:09 2018 -0400 robot memory: requery the oplog when failing to read it Do not only catch the exception, but also requery it, as the oplog cursor is probably dead. http://git.fawkesrobotics.org/fawkes.git/commit/3174aee http://trac.fawkesrobotics.org/changeset/3174aee - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 8da89a2c83f5b572dc4cef2cb2c2b07de694221a Merge: d8061bf 3174aee Author: Till Hofmann AuthorDate: Wed Jun 20 16:53:10 2018 -0400 Commit: Till Hofmann CommitDate: Wed Jun 20 16:53:10 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-lock-thread-safety' into current http://git.fawkesrobotics.org/fawkes.git/commit/8da89a2 http://trac.fawkesrobotics.org/changeset/8da89a2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f8669b51b331334a2522e5224d332aaf91be5387 Author: Till Hofmann AuthorDate: Thu Jun 21 02:36:11 2018 -0400 Commit: Till Hofmann CommitDate: Thu Jun 21 02:36:11 2018 -0400 clips-executive: do not wait until unlocking a resource completes Instead, directly proceed and clean up the goal. http://git.fawkesrobotics.org/fawkes.git/commit/f8669b5 http://trac.fawkesrobotics.org/changeset/f8669b5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 774e1a6ed394da3593d563345e4d433d01117c4b Merge: 8da89a2 f8669b5 Author: Till Hofmann AuthorDate: Thu Jun 21 09:11:24 2018 -0400 Commit: Till Hofmann CommitDate: Thu Jun 21 09:11:24 2018 -0400 Merge remote-tracking branch 'origin/thofmann/cx-do-not-wait-on-unlock' into current http://git.fawkesrobotics.org/fawkes.git/commit/774e1a6 http://trac.fawkesrobotics.org/changeset/774e1a6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2ab6397468e03b8481e2bd6c7f1cf0f317edb7a1 Author: Till Hofmann AuthorDate: Thu Jun 21 12:12:31 2018 -0400 Commit: Till Hofmann CommitDate: Thu Jun 21 12:12:31 2018 -0400 clips-executive: reject goals requiring resource with pending unlock http://git.fawkesrobotics.org/fawkes.git/commit/2ab6397 http://trac.fawkesrobotics.org/changeset/2ab6397 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Fawkes Git] branch/thofmann/robot-memory-lock-thread-safety: robot memory: requery the oplog when failing to read it
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/robot-memory-lock-thread-safety has been updated to 3174aee196e951aba26d633b1fc6bd1df6cc0d93 (commit) from de94b71d5d66187eb91e3b0a4362e494423f5f74 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-lock-thread-safety Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- - *Summary* --- src/plugins/robot-memory/event_trigger_manager.cpp |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) - *Diffs* - -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/robot-memory-renewal-succeeded-but-lock-expired: robot-memory: always fail renewal on an open mutex disregarding response
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/robot-memory-renewal-succeeded-but-lock-expired has been updated to 10335a391d6bda916d4c8f9c3503f8759a29731d (commit) from cb63e11a76d931bd1d47e0e8614ccf2b6a32173b (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/robot-memory-renewal-succeeded-but-lock-expired Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 10335a391d6bda916d4c8f9c3503f8759a29731d Author: Till Hofmann AuthorDate: Tue Jun 19 16:25:14 2018 -0400 Commit: Till Hofmann CommitDate: Tue Jun 19 16:25:14 2018 -0400 robot-memory: always fail renewal on an open mutex disregarding response The response may still be pending but the mutex is already open. In this case, also let the renewal fail. http://git.fawkesrobotics.org/fawkes.git/commit/10335a3 http://trac.fawkesrobotics.org/changeset/10335a3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 10335a391d6bda916d4c8f9c3503f8759a29731d - - - - - - - - - - Author: Till Hofmann Date:Tue Jun 19 16:25:14 2018 -0400 Subject: robot-memory: always fail renewal on an open mutex disregarding response .../clips-executive/clips/coordination-mutex.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/coordination-mutex.clp b/src/plugins/clips-executive/clips/coordination-mutex.clp index 50a5009..7c7eae9 100644 --- a/src/plugins/clips-executive/clips/coordination-mutex.clp +++ b/src/plugins/clips-executive/clips/coordination-mutex.clp @@ -389,7 +389,7 @@ (defrule mutex-lock-auto-renew-done-but-lock-open ?mf <- (mutex (name ?name) (state OPEN) - (request RENEW-LOCK) (response ACQUIRED) + (request RENEW-LOCK) (pending-requests AUTO-RENEW-PROC $?pending-requests)) => (printout error "Renewed " ?name " but lock has expired in the meantime. " -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-example-without-pddl: 3 revs updated. (1.0.1-679-g837a0d0)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-example-without-pddl has been updated discards 4fd386e22509ca08ab07b66259f5861e01919476 (commit) discards 016b821432c19d30c9564e13197d25c875f4736c (commit) to 837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03 (commit) via 50fde735c294efdc82c6eecd269aec3da96aeef6 (commit) via 93381b569a8cd2d6e0f8046333807ed4d7af7f11 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (4fd386e22509ca08ab07b66259f5861e01919476) \ N -- N -- N (837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-example-without-pddl Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 93381b569a8cd2d6e0f8046333807ed4d7af7f11 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 6 17:29:31 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:26:12 2018 +0100 clips-executive: copy PDDL test scenario to a separate scenario We want a test scenario without PDDL as default. Copy the existing PDDL test scenario so we can still use it later. http://git.fawkesrobotics.org/fawkes.git/commit/93381b5 http://trac.fawkesrobotics.org/changeset/93381b5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 50fde735c294efdc82c6eecd269aec3da96aeef6 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 6 17:40:17 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:26:12 2018 +0100 clips-executive: adapt default test scenario to not use PDDL Instead of creating a plan with PDDL, use the fixed action sequence from the example. This also removes the dependency on robot memory. http://git.fawkesrobotics.org/fawkes.git/commit/50fde73 http://trac.fawkesrobotics.org/changeset/50fde73 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 837a0d0ddf806e8cf639be7c0baf8a32fcc1cc03 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Mar 7 19:22:34 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:26:12 2018 +0100 clips-executive: add spec for the test scenario with PDDL The PDDL test scenario was moved to test-scenario-pddl, add a clips-executive spec for the scenario and adapt the config accordingly. http://git.fawkesrobotics.org/fawkes.git/commit/837a0d0 http://trac.fawkesrobotics.org/changeset/837a0d0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- cfg/conf.d/clips-executive.yaml| 18 ++ cfg/conf.d/pddl-planner.yaml |2 +- cfg/conf.d/pddl-robot-memory.yaml |4 +- .../clips/test-scenario-pddl/problem.pddl | 35 .../clips/test-scenario-pddl/problem.pddl.soln |3 -- 5 files changed, 21 insertions(+), 41 deletions(-) delete mode 100644 src/plugins/clips-executive/clips/test-scenario-pddl/problem.pddl delete mode 100644 src/plugins/clips-executive/clips/test-scenario-pddl/problem.pddl.soln - *Diffs* - - *commit* 93381b569a8cd2d6e0f8046333807ed4d7af7f11 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Tue Mar 6 17:29:31 2018 +0100 Subject: clips-executive: copy PDDL test scenario to a separate scenario .../action-selection.clp |0 .../domain.pddl|0 .../execution-monitoring.clp |0 .../fixed-sequence.clp |0 .../goal-expander-pddl.clp |0 .../goal-reasoner.clp |0 .../print-action.clp |0 .../problem-template.pddl |0 .../state-estimation.clp |0 .../test-domain.clp
[Fawkes Git] branch/thofmann/clips-executive-nonunique-action-ids: created (1.0.1-681-g6721a90)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-nonunique-action-ids has been created at 6721a9095d76e5f50fc365ce2fa5c9bde90b608d (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-nonunique-action-ids - *Log* --- commit 222a1ae737b3e77fe4ad6c4262302843986f3f41 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Mar 7 18:51:42 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:31:26 2018 +0100 clips-executive: action IDs are only unique for a fixed goal and plan Action IDs are no longer unique globally, but for a given goal and plan. Similarly, plan IDs are no longer unique globally, but only for a given goal. Adapt precondition grounding and checking and effect application such that it always checks the goal ID and plan ID. All plan-actions now always need to refer to a goal and a plan. Also modify the test scenario and all tests to the change and add a test that checks that we only apply effects for the right action, even if there is a second action with the same action ID. http://git.fawkesrobotics.org/fawkes.git/commit/222a1ae http://trac.fawkesrobotics.org/changeset/222a1ae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6721a9095d76e5f50fc365ce2fa5c9bde90b608d Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Mar 7 19:19:16 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Mar 7 19:31:42 2018 +0100 clips-executive: add goal-ids to plan-actions of PDDL plans When parsing the result of the planner, also fill the goal-id slot of the plan-action so a plan-action is always associated with a goal. Since we no longer need to have globally unique action IDs, remove the offset computation for the action IDs for PDDL actions. http://git.fawkesrobotics.org/fawkes.git/commit/6721a90 http://trac.fawkesrobotics.org/changeset/6721a90 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/pddl.clp | 11 ++- 1 files changed, 2 insertions(+), 9 deletions(-) - *Diffs* - - *commit* 222a1ae737b3e77fe4ad6c4262302843986f3f41 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Wed Mar 7 18:51:42 2018 +0100 Subject: clips-executive: action IDs are only unique for a fixed goal and plan src/plugins/clips-executive/clips/domain.clp | 108 ++-- src/plugins/clips-executive/clips/plan.clp |2 + .../clips/test-scenario/fixed-sequence.clp | 15 ++- .../clips-executive/clips/tests/blocksworld.clp|8 +- .../clips/tests/conditional_say.clp|4 +- .../clips-executive/clips/tests/test_domain.cpp| 47 - 6 files changed, 139 insertions(+), 45 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index 090e929..ae3a807 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -80,6 +80,10 @@ (deftemplate domain-pending-sensed-fact "An action effect of a sensed predicate that is still pending." (slot name (type SYMBOL) (default ?NONE)) + (slot goal-id (type SYMBOL)) + (slot plan-id (type SYMBOL)) + ; TODO: Rename to action for consistency. Do this when we no longer need to + ; stay compatible with lab course code. (slot action-id (type INTEGER)) (slot type (type SYMBOL) (allowed-values POSITIVE NEGATIVE) (default POSITIVE)) @@ -116,6 +120,10 @@ precondition belongs to. Note that grounded should always be yes if the action is not nil." (slot part-of (type SYMBOL)) + (slot goal-id (type SYMBOL)) + (slot plan-id (type SYMBOL)) + ; TODO: Rename to action for consistency. Do this when we no longer need to + ; stay compatible with lab course code. (slot grounded-with (type INTEGER) (default 0)) (slot name (type SYMBOL) (default-dynamic (gensym*))) (slot type (type SYMBOL) (allowed-values conjunction negation)) @@ -133,6 +141,10 @@ See the tests for an example. " (slot part-of (type SYMBOL)) + (slot goal-id (type SYMBOL)) + (slot plan-id (type SYMBOL)) + ; TODO: Rename to action for consistency. Do this when we no longer need to + ; stay compatible with lab course code. (slot grounded-with (type INTEGER) (default 0)) (slot name (
[Fawkes Git] branch/thofmann/clips-executive-nonunique-action-ids: clips-executive: fix test for nonunique action IDs
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/clips-executive-nonunique-action-ids has been updated
to ddd314220879e32ab4e3fd58a302f663345594a7 (commit)
from 6721a9095d76e5f50fc365ce2fa5c9bde90b608d (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-nonunique-action-ids
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit ddd314220879e32ab4e3fd58a302f663345594a7
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Thu Mar 8 20:26:09 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Thu Mar 8 21:05:23 2018 +0100
clips-executive: fix test for nonunique action IDs
The test expected unstack not to be executable, when in fact it was. The
test is supposed to check that preconditions are properly matched to
actions, even if actions have the same IDs but different goals/plans.
Do the test with stack instead, as stack is in fact not executable in
the given situation.
http://git.fawkesrobotics.org/fawkes.git/commit/ddd3142
http://trac.fawkesrobotics.org/changeset/ddd3142
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
.../clips-executive/clips/tests/blocksworld.clp| 20
.../clips-executive/clips/tests/test_domain.cpp| 12
2 files changed, 28 insertions(+), 4 deletions(-)
- *Diffs* -
- *commit* ddd314220879e32ab4e3fd58a302f663345594a7 - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Thu Mar 8 20:26:09 2018 +0100
Subject: clips-executive: fix test for nonunique action IDs
.../clips-executive/clips/tests/blocksworld.clp| 20
.../clips-executive/clips/tests/test_domain.cpp| 12
2 files changed, 28 insertions(+), 4 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/clips-executive/clips/tests/blocksworld.clp
b/src/plugins/clips-executive/clips/tests/blocksworld.clp
index 7b1915b..b31326e 100644
--- a/src/plugins/clips-executive/clips/tests/blocksworld.clp
+++ b/src/plugins/clips-executive/clips/tests/blocksworld.clp
@@ -51,6 +51,26 @@
(domain-effect
(part-of unstack) (predicate on) (type NEGATIVE)
(param-names x y))
+ ; stack
+ (domain-operator (name stack))
+ (domain-operator-parameter (operator stack) (type block) (name x))
+ (domain-operator-parameter (operator stack) (type block) (name y))
+ (domain-precondition
+(part-of stack) (name stack-precond) (type conjunction))
+ (domain-atomic-precondition
+(part-of stack-precond) (param-names x) (predicate holding))
+ (domain-atomic-precondition
+(part-of stack-precond) (param-names y) (predicate clear))
+ (domain-effect
+(part-of stack) (predicate holding) (param-names x) (type NEGATIVE))
+ (domain-effect
+(part-of stack) (predicate clear) (param-names y) (type NEGATIVE))
+ (domain-effect
+(part-of stack) (predicate clear) (param-names x))
+ (domain-effect
+(part-of stack) (predicate handempty))
+ (domain-effect
+(part-of stack) (predicate on) (param-names x y))
; world model
(domain-fact (name handempty))
diff --git a/src/plugins/clips-executive/clips/tests/test_domain.cpp
b/src/plugins/clips-executive/clips/tests/test_domain.cpp
index dae8370..1961bdd 100644
--- a/src/plugins/clips-executive/clips/tests/test_domain.cpp
+++ b/src/plugins/clips-executive/clips/tests/test_domain.cpp
@@ -420,7 +420,10 @@ TEST_F(BlocksworldDomainTest, NonUniqueActionIDs)
{
env.reset();
env.assert_fact("(plan-action (id 1) (goal-id g0) (plan-id p1)"
- " (action-name unstack)"
+ " (action-name stack)"
+ " (param-names x y) (param-values b1 b2))");
+ env.assert_fact("(plan-action (id 1) (goal-id g1) (plan-id p0)"
+ " (action-name stack)"
" (param-names x y) (param-values b1 b2))");
env.run();
// The action pick-up with ID 1 in plan p0 of goal g0. This should be
@@ -434,9 +437,10 @@ TEST_F(BlocksworldDomainTest, NonUniqueActionIDs)
"(and (eq ?a:id 1) (eq ?a:goal-id g0) (eq ?a:plan-id p1)"
" (eq ?a:executable FALSE))"
));
- env.assert_fact("(plan-action (id 1) (goal-id g1) (plan-id p0)"
- " (action-name unstack)"
- " (param-nam
[Fawkes Git] branch/thofmann/clips-executive-exog-actions: clips-executive: add exogenous actions, drop precond on sensed effect
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-exog-actions has been updated discards 70c8da25dac9a1ec6456b18ccdda503280c7cfce (commit) to 16dd8a226c753f4e05848cd51c028023336228a8 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (70c8da25dac9a1ec6456b18ccdda503280c7cfce) \ N -- N -- N (16dd8a226c753f4e05848cd51c028023336228a8) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-exog-actions Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 16dd8a226c753f4e05848cd51c028023336228a8 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Mar 9 00:24:21 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 11:05:59 2018 +0100 clips-executive: add exogenous actions, drop precond on sensed effect For any exogenous action, a precondition is removed from the operator definition if the operator also has the same predicate with the same parameters and constants as sensed effect. This means that parts of the effect may already have occurred before the exogenous action is executed. By modifying the precondition, we make sure that the exogenous action is still executable in that situation. http://git.fawkesrobotics.org/fawkes.git/commit/16dd8a2 http://trac.fawkesrobotics.org/changeset/16dd8a2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/domain.clp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) - *Diffs* - - *commit* 16dd8a226c753f4e05848cd51c028023336228a8 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Fri Mar 9 00:24:21 2018 +0100 Subject: clips-executive: add exogenous actions, drop precond on sensed effect src/plugins/clips-executive/clips/domain.clp | 32 .../clips-executive/clips/tests/test_domain.cpp| 40 2 files changed, 72 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index 0a4eb32..f5aeee5 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -100,6 +100,7 @@ (slot name (type SYMBOL)) (multislot param-names) (slot wait-sensed (type SYMBOL) (allowed-values TRUE FALSE) (default TRUE)) + (slot exogenous (type SYMBOL) (allowed-values TRUE FALSE) (default FALSE)) ) (deftemplate domain-operator-parameter @@ -240,6 +241,37 @@ (modify ?precond (operator ?op)) ) +(deffunction remove-precondition + "Remove an atomic precondition from its parent and clean up the precondition + tree. If the parent is a disjunction with no other disjunct, simplify it to + true by removing it recursively. If it is a negation, remove it recursively. + If it's a conjunction, only remove the conjunct." + (?precond-name) + (printout t "Removing precondition " ?precond-name crlf) + (do-for-fact +((?precond domain-atomic-precondition) (?parent domain-precondition)) +(eq ?precond:part-of ?parent:name) +(if (or (eq ?parent:type disjunction) (eq ?parent:type negation)) then + (remove-precondition ?parent:name) +) +(retract ?precond) + ) +) + +(defrule domain-remove-cond-on-sensed-effect-of-exog-action + "If an exogenous action has a precondition on a sensed effect of itself, then + add the effect as disjunct to the precondition. This means that part of the + exogenous action may already have occurred before the action is selected." + (domain-operator (name ?op) (exogenous TRUE)) + (domain-predicate (name ?pred) (sensed TRUE)) + (domain-effect (part-of ?op) (predicate ?pred) +(param-names $?params) (param-constants $?constants)) + (domain-atomic-precondition (name ?precond) (operator ?op) +(predicate ?pred) (param-names $?params) (param-constants $?constants)) +=> + (remove-preconditi
[Fawkes Git] branch/thofmann/clips-executive-exog-actions: created (1.0.1-685-g70c8da2)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-exog-actions has been created at 70c8da25dac9a1ec6456b18ccdda503280c7cfce (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-exog-actions - *Log* --- commit 41857b255ee68e98cea71f5adfd6820370c4c6ff Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 8 12:56:43 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 8 21:07:42 2018 +0100 clips-executive: add the operator to domain preconditions In some cases, we need to refer to the operator of a nested/atomic precondition. Add a slot operator that always gives the name of the operator the precondition belongs to. For the root precondition (i.e., the top-most precondition), the value of the slot operator is the same as the value of the slot part-of. http://git.fawkesrobotics.org/fawkes.git/commit/41857b2 http://trac.fawkesrobotics.org/changeset/41857b2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 10d854915b0efe4244dfc9561853b684815a63d2 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 8 21:31:15 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 8 21:31:15 2018 +0100 clips-executive: add support for disjunctive preconditions A disjunctive precondition is satisfied iff at least one child precondition is satisfied. This adds support for disjunctive preconditions in the CLIPS machinery. It does *not* support disjunctive preconditions in PDDL domains. http://git.fawkesrobotics.org/fawkes.git/commit/10d8549 http://trac.fawkesrobotics.org/changeset/10d8549 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 70c8da25dac9a1ec6456b18ccdda503280c7cfce Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Mar 9 00:24:21 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 00:24:21 2018 +0100 clips-executive: add exogenous actions, drop precond on sensed effect For any exogenous action, a precondition is removed from the operator definition if the operator also has the same predicate with the same parameters and constants as sensed effect. This means that parts of the effect may already have occurred before the exogenous action is executed. By modifying the precondition, we make sure that the exogenous action is still executable in that situation. http://git.fawkesrobotics.org/fawkes.git/commit/70c8da2 http://trac.fawkesrobotics.org/changeset/70c8da2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/clips-executive/clips/domain.clp | 84 +++- .../clips-executive/clips/tests/test_domain.cpp| 67 2 files changed, 150 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 41857b255ee68e98cea71f5adfd6820370c4c6ff - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Thu Mar 8 12:56:43 2018 +0100 Subject: clips-executive: add the operator to domain preconditions src/plugins/clips-executive/clips/domain.clp | 29 ++ 1 files changed, 29 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/domain.clp b/src/plugins/clips-executive/clips/domain.clp index ae3a807..c681d81 100644 --- a/src/plugins/clips-executive/clips/domain.clp +++ b/src/plugins/clips-executive/clips/domain.clp @@ -119,6 +119,7 @@ sub-conditions. The action is an optional ID of grounded action this precondition belongs to. Note that grounded should always be yes if the action is not nil." + (slot operator (type SYMBOL)) (slot part-of (type SYMBOL)) (slot goal-id (type SYMBOL)) (slot plan-id (type SYMBOL)) @@ -140,6 +141,7 @@ value of param-names will be ignored and should be set to c (for constant). See the tests for an example. " + (slot operator (type SYMBOL)) (slot part-of (type SYMBOL)) (slot goal-id (type SYMBOL)) (slot plan-id (type SYMBOL)) @@ -211,6 +213,33 @@ (modify ?a (param-names ?param-names)) ) +(defrule domain-add-operator-to-top-precondition + "If a precondition has no operator but is part of a name that is an operator, + add that name as operator to the precondition." + ?precond <- (domain-precondition (operator nil) (part-of ?op)) + (domain-operator (name ?op)) +=> +
[Fawkes Git] branch/thofmann/pddl-planner-do-not-use-old-plans: created (1.0.1-678-gcfb219a)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/pddl-planner-do-not-use-old-plans has been created
at cfb219ab36fc8dcc1565bcaa1dc7f441d35252a0 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/pddl-planner-do-not-use-old-plans
- *Log* ---
commit d46201cdad0c1885af55f8f0faa7a1fc0b8cc2a8
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Fri Mar 9 13:07:03 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Fri Mar 9 13:07:03 2018 +0100
pddl-planner: add interface field for planner success
The planner does not always find a plan, so the interface field "final"
does not suffice to determine whether the planner found a plan. Add a
separate field "success" that is true iff the planner has found a plan.
If the planner failed, "final" will be true, but "success" will be
false.
http://git.fawkesrobotics.org/fawkes.git/commit/d46201c
http://trac.fawkesrobotics.org/changeset/d46201c
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit cfb219ab36fc8dcc1565bcaa1dc7f441d35252a0
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Fri Mar 9 13:31:42 2018 +0100
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Fri Mar 9 13:31:42 2018 +0100
clips-executive: set goal mode to FAILED if planner did not find a plan
If the planner fails to compute a plan, fail properly instead of
re-using an old, possibly invalid plan that is still in the database.
http://git.fawkesrobotics.org/fawkes.git/commit/cfb219a
http://trac.fawkesrobotics.org/changeset/cfb219a
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/clips-executive/clips/pddl.clp | 15 ++-
1 files changed, 14 insertions(+), 1 deletions(-)
- *Diffs* -
- *commit* d46201cdad0c1885af55f8f0faa7a1fc0b8cc2a8 - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Fri Mar 9 13:07:03 2018 +0100
Subject: pddl-planner: add interface field for planner success
src/libs/interfaces/PddlPlannerInterface.h |6 +++
.../interfaces/PddlPlannerInterface.cpp| 38 +++-
.../interfaces/PddlPlannerInterface.h_ext |6 +++
.../interfaces/PddlPlannerInterface.tolua |3 ++
.../interfaces/PddlPlannerInterface.xml|3 ++
src/plugins/pddl-planner/pddl-planner_thread.cpp |4 ++
6 files changed, 59 insertions(+), 1 deletions(-)
_Diff for modified files_:
diff --git a/src/libs/interfaces/PddlPlannerInterface.h
b/src/libs/interfaces/PddlPlannerInterface.h
index 7fcc8fa..2bba677 100644
--- a/src/libs/interfaces/PddlPlannerInterface.h
+++ b/src/libs/interfaces/PddlPlannerInterface.h
@@ -49,6 +49,9 @@ class PddlPlannerInterface : public Interface
bool final; /**<
Is the planning finished?
*/
+bool success; /**<
+ True if the planner found a plan
+ */
char active_planner[30]; /**<
Currently selected planner
*/
@@ -98,6 +101,9 @@ class PddlPlannerInterface : public Interface
bool is_final() const;
void set_final(const bool new_final);
size_t maxlenof_final() const;
+ bool is_success() const;
+ void set_success(const bool new_success);
+ size_t maxlenof_success() const;
char * active_planner() const;
void set_active_planner(const char * new_active_planner);
size_t maxlenof_active_planner() const;
diff --git a/src/plugins/pddl-planner/interfaces/PddlPlannerInterface.cpp
b/src/plugins/pddl-planner/interfaces/PddlPlannerInterface.cpp
index 1fd3be9..b76fc81 100644
--- a/src/plugins/pddl-planner/interfaces/PddlPlannerInterface.cpp
+++ b/src/plugins/pddl-planner/interfaces/PddlPlannerInterface.cpp
@@ -52,9 +52,10 @@ PddlPlannerInterface::PddlPlannerInterface() : Interface()
memset(data_ptr, 0, data_size);
add_fieldinfo(IFT_UINT32, "msg_id", 1, >msg_id);
add_fieldinfo(IFT_BOOL, "final", 1, >final);
+ add_fieldinfo(IFT_BOOL, "success", 1, >success);
add_fieldinfo(IFT_STRING, "active_planner", 30, data->active_planner);
add_messageinfo("PlanMessage");
- unsigned char tmp_hash[] = {0xcd, 0x44, 0x52, 0xa7, 0xfa, 0xb2, 0xaf, 0xfe,
0xe2, 0xc5, 0x4, 0x6b, 0xe0, 0x97, 0x2b, 0x69};
+ unsigned char tmp_hash[] = {0x47, 0x74, 0xd7, 0xcf, 0x3d, 0xe5, 0x68, 0xa6,
0x44, 0xf1, 0x1f, 0x54, 0x5d, 0xc0, 0x4d, 0xd8};
set_hash(tmp_hash);
}
@@ -134,6 +135,41 @@
[Fawkes Git] branch/common/current-clips-executive-rcll: 5 revs updated. (1.0.1-765-gc7c16a6)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current-clips-executive-rcll has been updated to c7c16a6bd648fa6d5e7b4363a22d5a14f02a6acf (commit) via 252239e30c02a83c2480c3bc75d09428de103b0c (commit) via 08879f9b70377d2e83dc2df848c9e68447149ac8 (commit) via c3900529533855291b414723b61df0f0ef4786e1 (commit) via a797835e4cd4c712b37aecf395473fc8289dce77 (commit) from 4f1c14b661bb3b51997f5f98bb2eed37eed97a4d (commit) http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit a797835e4cd4c712b37aecf395473fc8289dce77 Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 1 00:32:29 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 12:52:08 2018 +0100 clips-executive: Fix undesired late Grounding Fixed case: After actions are already completed and the Grounded preconds cleaned, the Grounding is triggered again leaving the Grounded precond in the factbase. This caused the problem that the next time this Action is Formulated in a plan. It attempts to use the old faulty Grounding. Reason: After removal of domain-wm-update after the cleaning. grounding rules are free to trigger again. http://git.fawkesrobotics.org/fawkes.git/commit/a797835 http://trac.fawkesrobotics.org/changeset/a797835 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c3900529533855291b414723b61df0f0ef4786e1 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Fri Mar 9 12:51:28 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 12:52:55 2018 +0100 clips-executive: print domain errors to log Along the way, remove deffacts which never got asserted and are processed in a rule already. http://git.fawkesrobotics.org/fawkes.git/commit/c390052 http://trac.fawkesrobotics.org/changeset/c390052 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 08879f9b70377d2e83dc2df848c9e68447149ac8 Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> AuthorDate: Wed Feb 28 19:39:33 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 12:55:21 2018 +0100 clips-executive: Fix matching of Action to Operator When applying effects, domain-oprator name is not matched with the actions name of the plan-action Discovered case: Caused the Actions to always go the state SENESED-EFFECT-WAIT if they had a sensed predicate regardless if the wait sensed FALSE. http://git.fawkesrobotics.org/fawkes.git/commit/08879f9 http://trac.fawkesrobotics.org/changeset/08879f9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 252239e30c02a83c2480c3bc75d09428de103b0c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Mar 9 13:07:03 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 13:35:01 2018 +0100 pddl-planner: add interface field for planner success The planner does not always find a plan, so the interface field "final" does not suffice to determine whether the planner found a plan. Add a separate field "success" that is true iff the planner has found a plan. If the planner failed, "final" will be true, but "success" will be false. http://git.fawkesrobotics.org/fawkes.git/commit/252239e http://trac.fawkesrobotics.org/changeset/252239e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c7c16a6bd648fa6d5e7b4363a22d5a14f02a6acf Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Fri Mar 9 13:31:42 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Fri Mar 9 13:35:01 2018 +0100 clips-executive: set goal mode to FAILED if planner did not find a plan If the planner fails to compute a plan, fail properly instead of re-using an old, possibly invalid plan that is still in the database. http://git.fawkesrobotics.org/fawkes.git/commit/c7c16a6 http://trac.fawkesrobotics.org/changeset/c7c16a6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/libs/interfaces/PddlPlannerInterface.h |6 +++ src/plugins/clips-executive/clips/domai
[Fawkes Git] branch/thofmann/clips-executive-example-without-pddl: created (1.0.1-678-g4fd386e)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-example-without-pddl has been created at 4fd386e22509ca08ab07b66259f5861e01919476 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-example-without-pddl - *Log* --- commit 016b821432c19d30c9564e13197d25c875f4736c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 6 17:29:31 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Mar 6 17:29:31 2018 +0100 clips-executive: copy PDDL test scenario to a separate scenario We want a test scenario without PDDL as default. Copy the existing PDDL test scenario so we can still use it later. http://git.fawkesrobotics.org/fawkes.git/commit/016b821 http://trac.fawkesrobotics.org/changeset/016b821 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 4fd386e22509ca08ab07b66259f5861e01919476 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Mar 6 17:40:17 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Mar 6 17:40:17 2018 +0100 clips-executive: adapt default test scenario to not use PDDL Instead of creating a plan with PDDL, use the fixed action sequence from the example. This also removes the dependency on robot memory. http://git.fawkesrobotics.org/fawkes.git/commit/4fd386e http://trac.fawkesrobotics.org/changeset/4fd386e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- cfg/conf.d/clips-executive.yaml|6 ++-- .../clips/test-scenario/goal-expander-pddl.clp | 26 -- .../clips/test-scenario/problem-template.pddl | 35 3 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 src/plugins/clips-executive/clips/test-scenario/goal-expander-pddl.clp delete mode 100644 src/plugins/clips-executive/clips/test-scenario/problem-template.pddl - *Diffs* - - *commit* 016b821432c19d30c9564e13197d25c875f4736c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Tue Mar 6 17:29:31 2018 +0100 Subject: clips-executive: copy PDDL test scenario to a separate scenario .../action-selection.clp |0 .../domain.pddl|0 .../execution-monitoring.clp |0 .../fixed-sequence.clp |0 .../goal-expander-pddl.clp |0 .../goal-reasoner.clp |0 .../print-action.clp |0 .../problem-template.pddl |0 .../problem.pddl} |6 +++--- .../clips/test-scenario-pddl/problem.pddl.soln |3 +++ .../state-estimation.clp |0 .../test-domain.clp|0 .../worldmodel-facts.clp |0 13 files changed, 6 insertions(+), 3 deletions(-) - *commit* 4fd386e22509ca08ab07b66259f5861e01919476 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Tue Mar 6 17:40:17 2018 +0100 Subject: clips-executive: adapt default test scenario to not use PDDL cfg/conf.d/clips-executive.yaml|6 ++-- .../clips/test-scenario/goal-expander-pddl.clp | 26 -- .../clips/test-scenario/problem-template.pddl | 35 3 files changed, 3 insertions(+), 64 deletions(-) _Diff for modified files_: diff --git a/cfg/conf.d/clips-executive.yaml b/cfg/conf.d/clips-executive.yaml index f21c6c9..74b77bd 100644 --- a/cfg/conf.d/clips-executive.yaml +++ b/cfg/conf.d/clips-executive.yaml @@ -49,15 +49,15 @@ clips-executive: # Agent name. On startup the clips-agent will try to resolve a file named # .clp. It must be in the CLIPS path directories. spec: test - use_pddl: true - sync_domain_facts: true + use_pddl: false + sync_domain_facts: false specs: test: domain: test-scenario/test-domain.clp worldmodel: test-scenario/worldmodel-facts.clp goal-reasoner: test-scenario/goal-reasoner.clp - goal-expander: test-scenario/goal-expander-pddl.clp + goal-expander: test-scenario/fixed-sequence.clp action-selection: test-scenario/action-selection.clp #macro-expansion: test-scenario/action-selection.clp action-execution: ["skills-actions.clp", "test-scenario/print-action
[Fawkes Git] branch/common/current: webview: add missing ifdef guards for the REST API
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, common/current has been updated
to 449543aaefbcc0aa03320ef95d1405297359bd9d (commit)
from 250ded3bff67e2fd240009cef48314c4354d22e2 (commit)
http://git.fawkesrobotics.org/fawkes.git/common/current
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit 449543aaefbcc0aa03320ef95d1405297359bd9d
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Tue Apr 10 17:48:34 2018 +0200
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Tue Apr 10 17:48:34 2018 +0200
webview: add missing ifdef guards for the REST API
http://git.fawkesrobotics.org/fawkes.git/commit/449543a
http://trac.fawkesrobotics.org/changeset/449543a
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/webview/webview_plugin.cpp |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
- *Diffs* -
- *commit* 449543aaefbcc0aa03320ef95d1405297359bd9d - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Tue Apr 10 17:48:34 2018 +0200
Subject: webview: add missing ifdef guards for the REST API
src/plugins/webview/webview_plugin.cpp |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/webview/webview_plugin.cpp
b/src/plugins/webview/webview_plugin.cpp
index 4e16c20..72020e0 100644
--- a/src/plugins/webview/webview_plugin.cpp
+++ b/src/plugins/webview/webview_plugin.cpp
@@ -50,10 +50,12 @@ WebviewPlugin::WebviewPlugin(Configuration *config)
config->get_bool("/webview/thread-pool/enable");
thread_list.push_back(new WebviewThread(enable_thread_pool));
+#ifdef HAVE_REST_APIS
thread_list.push_back(new BlackboardRestApi());
#ifdef HAVE_JPEG
thread_list.push_back(new ImageRestApi());
#endif
+#endif
}
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 465 revs updated. (1.0.1-855-g250ded3)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated discards 88f1c0505b94fd1c4a81d853b3ad4b903cc5d20e (commit) discards 6ad02d9cde0bcc743c735651b833f362023dfee5 (commit) discards 4c7f288c2aacd98dc026e430a9843a6a829f283c (commit) discards 52db4291248c4fe86194bf213809bf6fc9a16129 (commit) discards 348b00f9aa71a72d6aaf543a60ff255ab164dd14 (commit) discards 4c5d4ccfb65c5b389ec34d786c38cb02ae8bbf38 (commit) discards 3fb81b486a5b27181b283cc9fdd86c26050c2f84 (commit) discards 590c6cc48b1f76337d7eb2fd472570eae0b5b660 (commit) discards ba4c5c826df12812a1b466109e44eb9413917e11 (commit) discards 988fce9404fea02af92f59485afb11f543ea5a5f (commit) discards cf639e9daa3b5b143807cefcc8937b340816ae2b (commit) discards d6669745563bda28008d22f1bddb2e8eae63ec21 (commit) discards ba9fe31feb53dff73b8ab424cb8a733c3a33311d (commit) discards cbb454b7e472e200c419d45c701e47394c9a527a (commit) discards 03a1c8be4989d5ddcb996cd0e3281e81511327b5 (commit) discards b595c0acf5bde2190950d222b4faa81549b65d70 (commit) discards a65e55cafeece446eddfe8bb94e1692db676ee5e (commit) discards f300f67eefb4832a9e0e75dafeb49374c49df1c3 (commit) discards 0e85d7f8e4fd59828d720eb81bd6356309a3ef53 (commit) discards e20993c8edce669a6dfc920124d4df4ea36a33ce (commit) discards 10751eca59eaa7eaa2a30e3432d66ab12bed0f27 (commit) discards 2bc90db0d881cba3ddfbd50a2d07bfa8b835bc97 (commit) discards 1f4ff29a63687808cb6d591c945aba84f5d586ee (commit) discards d13b23845d9b6368163434bfce927ccb89490886 (commit) discards c5d8b1fbcc039374532b8bfeea7305c53b00ffd3 (commit) discards 5cc8726b372e335df4c2ae74c6d3e4a0fc734306 (commit) discards 5a895ebc5fe3c3ca5b80514e28b91caea89c0a6b (commit) discards 5906cbcf5a49936fdbc4b144533982b3de7f6905 (commit) discards 1b860b56391e349fc227f1faed9afdaa3c84c3d5 (commit) discards e6abc282cfacd4e3693f32bf30a9cc671e8e07e3 (commit) discards e9a1f7bb05c3e0090c1e3dab0bc0e04bb1b0b133 (commit) discards 772e219264283349413ca2575cb39a127eaeceb0 (commit) discards 977f75fc15606ef9053524b83405fae7f6c1 (commit) discards a101353534db9b614061a67b186cb269d18d06af (commit) discards 11ba0a726ec309f0bea577916fc59ae481cb114a (commit) discards 95f7d02bd3cb45971ffc4fdef3a85b616c09da9f (commit) discards d470615301663f5959e5885c951eb8fa9732adee (commit) discards 8718afed0ab67b14fb05589554f09268c35fe93c (commit) discards 94a54c95c0e8726a4fa564de0ad1fb408752c46f (commit) discards abd62e4b23fdd91f8c89a103c89cbb1c952378a2 (commit) discards 913018c8804fa3e20f77ee47f22a2744ae651f76 (commit) discards 419cc8cd9045a00765003c2fd42c056639264d5f (commit) discards b883ed68b7291b3ba7f8a508706a0f5692c843b5 (commit) discards 1c75b1678c5070c8da9dee0a75c2da1fc09514f6 (commit) discards 56e7272fa748f68ab1aabde14063d2ce8a36b8e9 (commit) discards 0bebad7e6cc977fb9dc43233b626cf4b1cea480f (commit) discards c841bbdc88ec92555b62b4b7d2783a734a80a053 (commit) discards 6788a9283a1a6a587a1838f2b77af1ef45fa0d6b (commit) discards c96bdb8b7af40ddce8ed9422a9502ec133481c83 (commit) discards e3e3801d6f2e80f9cb6c707f2ffcc8d25bee1015 (commit) discards 891c360a6ae69f482a25a64bb02838f398d9f45d (commit) discards 302ad7b7a4cb5f6022f5f4fc88fc98d9897f7389 (commit) discards 6f08468dd2d6c5e9f8289dee146324c306a5fed3 (commit) discards 6365850dec60ef96fcc76244b5aaedd4834fcccd (commit) discards 12bc2f63312b41f6c380972c8f474033f383f269 (commit) discards c2992c8d88a5e9e90d74fc9c95981b8c2acbedac (commit) discards 8412da97dbd617a31c263f59523ac436f9bd8964 (commit) discards e16e6fba28e9794f7eb52bfaf3a33ae64ce67fa6 (commit) discards 80250dddcec1421c2ef2144ee766d1ad094c723b (commit) discards 7b6c88c3b1e1756a7f091005de0ad9a6ec3b7fd9 (commit) discards ec17ebb7d7824399879b556a104cd4a02b86dab8 (commit) discards 14f6075887605fcb26bae22d7b0f3a18001683eb (commit) discards e4389f5d641df1505d0b8ee59ffb85b10e2eef24 (commit) discards 7e24aaa7968f1dc89756768684e907e86e78d10f (commit) discards 14930c6c543608c4b756ca4b97b557f718d1f7ea (commit) discards 78493369d44b4ef022fab9ffd7ceda5eeba65757 (commit) discards b984f4334bad45dfcb6b68953a4292932c5cc721 (commit) discards 7140c578a77dba842b3b7fbe3def301fef1a73aa (commit) discards 7f442db485027a4270d3ef6422b4e239fd1810cc (commit) discards 7373d3abd2e028c39a662c4c8de45974ccb22199 (commit) discards 9c03796d061b27534c7b67fcb04c53aa80b1208c (commit) discards fb77f48209ad4bd31a5ed81a780b3a86978d4b5d (commit) discards 7eb757be3c24a3d530b5c3b03950682c2b4dd56c (commit) discards cf7ea1f429f21195f31b4fafc964e92735023fbb (commit) discards 8a07000ce64ed9535963a9c501c4271a5f654ea7 (commit) discards cc9471f846e84185cfd5493b6bea1fbf6bce9173 (commit) discards
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-911-gba8ea8b)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, common/current has been updated
to ba8ea8b0b6e271c33e516946a171d87e21046141 (commit)
via ec7a7167b471cbebd3ae28d1a882442126331e3f (commit)
from fdf25d0ba573a8a5905f4dc46fc206976a07c59b (commit)
http://git.fawkesrobotics.org/fawkes.git/common/current
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit ba8ea8b0b6e271c33e516946a171d87e21046141
Merge: fdf25d0 ec7a716
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Thu Apr 12 10:59:42 2018 +0200
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Thu Apr 12 10:59:42 2018 +0200
Merge remote-tracking branch 'origin/timn/webview-2.0' into common/current
http://git.fawkesrobotics.org/fawkes.git/commit/ba8ea8b
http://trac.fawkesrobotics.org/changeset/ba8ea8b
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/skiller/Makefile |6 +-
.../{pantilt => skiller}/interfaces/Makefile |6 +++---
.../{ => interfaces}/SkillerDebugInterface.cpp |0
.../{ => interfaces}/SkillerDebugInterface.h_ext |0
.../{ => interfaces}/SkillerDebugInterface.tolua |0
.../{ => interfaces}/SkillerDebugInterface.xml |0
6 files changed, 4 insertions(+), 8 deletions(-)
copy src/plugins/{pantilt => skiller}/interfaces/Makefile (81%)
rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.cpp (100%)
rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.h_ext (100%)
rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.tolua (100%)
rename src/plugins/skiller/{ => interfaces}/SkillerDebugInterface.xml (100%)
- *Diffs* -
- *commit* ba8ea8b0b6e271c33e516946a171d87e21046141 - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Thu Apr 12 10:59:42 2018 +0200
Subject: Merge remote-tracking branch 'origin/timn/webview-2.0' into
common/current
src/plugins/skiller/Makefile |6 +-
.../{pantilt => skiller}/interfaces/Makefile |6 +++---
.../{ => interfaces}/SkillerDebugInterface.cpp |0
.../{ => interfaces}/SkillerDebugInterface.h_ext |0
.../{ => interfaces}/SkillerDebugInterface.tolua |0
.../{ => interfaces}/SkillerDebugInterface.xml |0
6 files changed, 4 insertions(+), 8 deletions(-)
_Diff for modified files_:
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current:
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated discards ba8ea8b0b6e271c33e516946a171d87e21046141 (commit) discards fdf25d0ba573a8a5905f4dc46fc206976a07c59b (commit) discards 449543aaefbcc0aa03320ef95d1405297359bd9d (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (ec7a7167b471cbebd3ae28d1a882442126331e3f) \ O -- O -- O (ba8ea8b0b6e271c33e516946a171d87e21046141) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. http://git.fawkesrobotics.org/fawkes.git/common/current No new revisions were added by this update. - *Summary* --- src/plugins/webview/webview_plugin.cpp |1 - 1 files changed, 0 insertions(+), 1 deletions(-) - *Diffs* - -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 53 revs updated. (1.0.1-909-gfdf25d0)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to fdf25d0ba573a8a5905f4dc46fc206976a07c59b (commit) via 012942810827c0e201a91e79cc64572b254e8fa8 (commit) via a9cf4d573b5886da70b76308a07493d0a6e1eebd (commit) via 7f2d276c9a18a1d29adbed5906befb22a34ef14d (commit) via 40912a7b0cb495b178b3755a83b647eb45ac08d6 (commit) via e6ca1203e130b0b32f853019b938c4e33c37a826 (commit) via 0ecbf7c5f20fc6a3be74f51fb2eb0e12f485be00 (commit) via 56c48b8a866fd899a3d23db9cd4f82ad556070f9 (commit) via 23ad5a216063f6d39a2525176998c30fcbd0fb43 (commit) via 49a6aefec5fc0fdf47c0a4ce4474e4834c61d797 (commit) via aee8c0a7b3c3c4eb3c1318866320554961e8b46d (commit) via 11d832bebeb928867681aec8fe5f72e80f39d977 (commit) via cd2ade005a1a9d002c15a9a7e59157b19de3524e (commit) via 71c107744fb385997c7f4cc4276663743e272c54 (commit) via e2fe7bf33977374ff59ded69cbe81a5b335224b9 (commit) via ac6ca63474af331f668f319bedb71af43653b89f (commit) via a5f032bd56792304e5b048ab5279096d65abbdcc (commit) via e655710f8019159a089a0a6cf83a45877e123e66 (commit) via c11bd7025eb5e83cc9850c9b1cc6fc936cb35669 (commit) via 8b0c90235ec9f98ccbffc999fce7710fd99e6eeb (commit) via 7383cbc889c98bc2039030a2a3ddc7914aed909e (commit) via 5ad234ae02c63f071850a06d45fb8249281f9314 (commit) via 2128e889ace9c7c5e41f25b169d1f1c4c9a76ea7 (commit) via 1d306f212b1d6237663afe043b14f59b5bf50052 (commit) via 4d08ffe4f36bfd666c019004b98ee0bdab8cf154 (commit) via 817de047259d09a1d95f2aca3695e7350d04b68d (commit) via 19ce4d0e39b1094703d454db8265b9f0fbf6331f (commit) via 8c1aa9014abec21a9b6df8404ba59c11db9bbaf5 (commit) via 35a5f413386a8b2a9d565451152d4c3c94eda296 (commit) via 921c1dae4f690e16b027fa4f3607517338f2d71c (commit) via b7d5db3008e1db496c0485c614cece30e4570526 (commit) via 891e7d8483f91cf397b1df3465d9a3af776be3dd (commit) via 480da4a8c46b1b3870f91d883812af05286d0de8 (commit) via 338d84a6aa01150f24b16dd5dd81bb6b8f93a695 (commit) via b6d6ef265baa7eeefe326a0ab2fa1078cbc584de (commit) via 4abb38ff69c300a3c0097e378436ffb1965566eb (commit) via dc53e8042b86fa4d8e9559cac217967c159320ee (commit) via f54d615201b457eea660dd2a30c7c2f5a0577ea9 (commit) via 182676f9ae9f99399bccefb681f8f920483878ff (commit) via 11e641d8e65e763e61329cd8ed9d46731fc9a482 (commit) via 4d6b8b9217b49181769d718f8a7d2f8b2356a855 (commit) via 93c3f880af3d5d4748831c43848bad3cc649e030 (commit) via d49761586d7c9693a74123c7e23674956393e009 (commit) via c5ead7c94daaf9d6427721475fe88ad2bc3e10df (commit) via edad2d54a1ccbcdaf1d69aced2ce23bef6f7e91c (commit) via dcc41e581bd5889e28b62f2e8eba192ac30b5285 (commit) via 5e204dc515656db7957ddb5a7dbc1b05bf5b7cf7 (commit) via fd8c527095b3be456fd0d02cf6b5d967cd019fd3 (commit) via bcb351a807ceb963546e2ea4aa0d88eef971a2ed (commit) via a06331bd0f4fcc5daec540b4f65372897d3324c5 (commit) via 5ae01f8a22ba112adaa7c81047244eec23c7578f (commit) via 86ab666a3fa2f7ab38620f3c040185e7e61571f4 (commit) via 2783e6cdf27c7030dbe5fb133954b291833a60ea (commit) from 449543aaefbcc0aa03320ef95d1405297359bd9d (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit fdf25d0ba573a8a5905f4dc46fc206976a07c59b Merge: 449543a 0129428 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Apr 12 10:34:48 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Apr 12 10:34:48 2018 +0200 Merge remote-tracking branch 'origin/timn/webview-2.0' into common/current http://git.fawkesrobotics.org/fawkes.git/commit/fdf25d0 http://trac.fawkesrobotics.org/changeset/fdf25d0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../templates/typescript-angular.ts.api.template |6 +- .../frontend/src/assets => res/webview}/.gitkeep |0 res/webview/chrome/dots.gif| Bin 50 -> 0 bytes res/webview/chrome/navlogo.png | Bin 1555 -> 0 bytes res/webview/chrome/navlogo.xcf | Bin 3415 -> 0 bytes res/webview/chrome/topbar_gradient.png | Bin 350 -> 0 bytes res/webview/chrome/topbar_gra
[Fawkes Git] branch/common/current: 6 revs updated. (1.0.1-914-gac1cee8)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, common/current has been updated
to ac1cee8fc7a846cf20ae163469167fe6d6281731 (commit)
via 2b21ec700e18ed1ea4013a4728e6864a23fc53ff (commit)
via a3034d36d78fa273309ec465e8cbf0beb74825f2 (commit)
via d25f61e00ccc2dcddc168ed816153255bde0 (commit)
via 1d806ddb872ac527b0aa22d24e016e065eefd364 (commit)
via 8e8758c73345903441ca1af36f2a1b18e7323114 (commit)
from ec7a7167b471cbebd3ae28d1a882442126331e3f (commit)
http://git.fawkesrobotics.org/fawkes.git/common/current
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
- *Summary* ---
src/plugins/webview/Makefile |1 +
.../{plugin-rest-api => config-rest-api}/Makefile |0
.../{tf-rest-api => config-rest-api}/api.yaml | 40 +++--
.../webview/config-rest-api/config-rest-api.cpp| 186 ++
.../config-rest-api.h} | 22 ++-
.../config-rest-api/model/ConfigTree.cpp} | 41 ++--
.../config-rest-api/model/ConfigTree.h}| 41 ++--
src/plugins/webview/frontend/src/app/app.module.ts |6 +-
.../frontend/src/components/promchart/component.ts | 206 ---
.../frontend/src/components/promstat/component.ts |9 +
.../blackboard/components/overview.component.ts|1 +
.../clips-executive/components/domain.component.ts |1 +
.../components/goal-detail.component.ts|1 +
.../components/goal-list.component.ts |1 +
.../parts/clips/components/clips-env.component.ts |1 +
.../dashboard/components/dashboard.component.html | 49 -
.../dashboard/components/dashboard.component.scss |5 +
.../dashboard/components/dashboard.component.ts| 16 ++-
.../parts/plugins/components/overview.component.ts |1 +
.../parts/skiller/components/overview.component.ts |1 +
.../transforms/components/overview.component.ts|1 +
.../services => services/config}/api.service.ts| 21 ++-
.../frontend/src/services/config/config.service.ts | 49 +
.../config/model/ConfigTree.ts}| 14 +-
src/plugins/webview/webview_plugin.cpp |2 +
25 files changed, 545 insertions(+), 171 deletions(-)
copy src/plugins/webview/{plugin-rest-api => config-rest-api}/Makefile (100%)
copy src/plugins/webview/{tf-rest-api => config-rest-api}/api.yaml (50%)
create mode 100644 src/plugins/webview/config-rest-api/config-rest-api.cpp
copy src/plugins/webview/{backendinfo-rest-api/backendinfo-rest-api.h =>
config-rest-api/config-rest-api.h} (81%)
copy src/plugins/{skiller/rest-api/model/SkillInfo.cpp =>
webview/config-rest-api/model/ConfigTree.cpp} (70%)
copy src/plugins/{skiller/rest-api/model/SkillInfo.h =>
webview/config-rest-api/model/ConfigTree.h} (82%)
copy src/plugins/webview/frontend/src/{parts/transforms/services =>
services/config}/api.service.ts (64%)
create mode 100644
src/plugins/webview/frontend/src/services/config/config.service.ts
copy src/plugins/webview/frontend/src/{parts/clips/models/Environment.ts =>
services/config/model/ConfigTree.ts} (62%)
- *Diffs* -
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current-clips-executive-rcll: pddl-planner: reset action list early to indicate failure
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, common/current-clips-executive-rcll has been updated
to a3b3b86410487e683844c37c3d0ee99d2f583480 (commit)
from 649f4921a769b9663a110cd0f452ded74c23c18b (commit)
http://git.fawkesrobotics.org/fawkes.git/common/current-clips-executive-rcll
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit a3b3b86410487e683844c37c3d0ee99d2f583480
Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de>
AuthorDate: Mon Mar 26 20:46:40 2018 +0200
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Fri Apr 13 13:34:28 2018 +0200
pddl-planner: reset action list early to indicate failure
If FF failed, the respective function would immediately return. However,
this would not reset the action list and in turn not set failure on the
planner interface. This way, the executive would still end up with stale
plans from the last successful run.
http://git.fawkesrobotics.org/fawkes.git/commit/a3b3b86
http://trac.fawkesrobotics.org/changeset/a3b3b86
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/pddl-planner/pddl-planner_thread.cpp |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
- *Diffs* -
- *commit* a3b3b86410487e683844c37c3d0ee99d2f583480 - - - - - - - - - -
Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de>
Date:Mon Mar 26 20:46:40 2018 +0200
Subject: pddl-planner: reset action list early to indicate failure
src/plugins/pddl-planner/pddl-planner_thread.cpp |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/pddl-planner/pddl-planner_thread.cpp
b/src/plugins/pddl-planner/pddl-planner_thread.cpp
index 0da5bf3..a562bd6 100644
--- a/src/plugins/pddl-planner/pddl-planner_thread.cpp
+++ b/src/plugins/pddl-planner/pddl-planner_thread.cpp
@@ -134,6 +134,8 @@ PddlPlannerThread::ff_planner()
//Parse Result and write it into the robot memory
logger->log_info(name(), "Parsing result");
+ action_list_.clear();
+
size_t cur_pos = 0;
if(result.find("found legal plan as follows", cur_pos) == std::string::npos)
{
logger->log_error(name(), "Planning Failed: %s", result.c_str());
@@ -144,7 +146,6 @@ PddlPlannerThread::ff_planner()
result.erase(result.find("time spent:", cur_pos));
cur_pos = result.find("step", cur_pos) + 4;
- action_list_.clear();
while(result.find(": ", cur_pos) != std::string::npos) {
cur_pos = result.find(": ", cur_pos) + 2;
size_t line_end = result.find("\n", cur_pos);
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-exog-actions: 48 revs updated. (1.0.1-730-gc737732)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/clips-executive-exog-actions has been updated discards 3e18adb7766fe04dd2af08687c91ced6ac4d2544 (commit) discards 58a37d0c8c2592939a0b25cd727f0ae5e2019ad5 (commit) discards 39dcf89271ec367e78d5af9633d04d0006c962aa (commit) discards eb1812158654f3901a0c747e73ca7338bd85ac50 (commit) discards 10d854915b0efe4244dfc9561853b684815a63d2 (commit) discards 41857b255ee68e98cea71f5adfd6820370c4c6ff (commit) to c7377326ecc199de24aab7826123996c4cbd040e (commit) via b59de4732dea67eb7422e70ca6ec41c340be498c (commit) via 9bf15efa4dcaa9868ca11f41a01d5992d987bed6 (commit) via 89d4ede0c4ecddc19c25c6d347290026fa539bc8 (commit) via 83e3fc965eaa5ecd37fa659eb566d7c59b9298c0 (commit) via 02408505413a31baeb56aaa0a12c737bf2c4a3a7 (commit) via 0525a778d3891913aa10939e86578431e90bad64 (commit) via fab402429cd7487379d863e10b3f82af3da18ed4 (commit) via 34514ff1bab724a11041513348b8c8a519fefb5f (commit) via 99233b0fb0b694f3d478dec10c0d6b0758cc5f93 (commit) via d90081b42d2807249e025ebeeafa95908ad33512 (commit) via be5a47c515f89317a41db277d7b9165d685913fa (commit) via 181b46fcb29fac2665bd2bedabbfe3388542ae5c (commit) via 26c99ae8489871a26e0ddbdd0eb9a048ceac1ce3 (commit) via 8f9c50390840f972557ef481a922fe6977dd5ff1 (commit) via f94e14170cd07744c0265df49c9eda5ff876c27b (commit) via 0440c67e464f535b1eafb43cf65049f3e58ec234 (commit) via 11be1913e80fb3415060db2c87ee812a783ec1c4 (commit) via 9a9b842507b072b717ca306ca9f1623d81514b59 (commit) via 72c0f3f84557d684fd86047ef851933f8390c824 (commit) via 563caa4872994bc753dc8e8ee256385a5ef3d16f (commit) via ba62f8b8bbce6165dc4dcd42faa7f0036ed57ce6 (commit) via 9078c6fcbfbf1185115129413c5ae97f36161ab0 (commit) via a83b3d883ae3537e1c5308fc65ff2fcdd4c5a789 (commit) via 4339f23a07412b2ea9ef0607f60bf8fd578e63b2 (commit) via be7382b63f9410e65901706ad1fa971a732e9b65 (commit) via b597d25e2c69c1aa4fb9b154a155228d85dd2e26 (commit) via 36b412365fc2ff34cb71127a50d241cdc355e638 (commit) via 78be2e85d3259fea480838119906329497138f86 (commit) via ad0be03324ed119dbbd3667efccef6267ca76fe5 (commit) via 25a03e83557b951e0e4eefff983c263a24ed27e7 (commit) via ca93cc82d368339bd16849e94ec59febbc3a6b4c (commit) via 3c6965b3f0ed2ed3952ef8da398415326dab7c6a (commit) via 1eb3af2c2417409f01def20b5f4a8ad11f8cedc1 (commit) via 34e9704f46956d54d4913b52996942920dea46c6 (commit) via b1d440f185661aa565275789738bca9e05262f31 (commit) via 5d394f0c2e9f1d2928007b63538d339e2ed03bfa (commit) via 367ce7f9d2bb39361fd1a8ac2d165e8a3a40353d (commit) via 3fc58fd8a028b5abf175c3df1b6c833bef6ae782 (commit) via 16a86f91de0ff434212692caa8b08c7de99f0aaf (commit) via 23241192e657334ad37ee9b75828234875253533 (commit) via 2a08ed396252912e7a831770d154d98999a5ec20 (commit) via d35cee61e5c29fafa60f09e9b13a3924bb9ce8bd (commit) via f6c44332b6bc391aacc73f1dd213d02c9d96c85d (commit) via 90d0f32beb6e3d8267ebd704157e0bee2bbfdb35 (commit) via dc456a0b8ab07e3fb87ff379bdde62ab68527837 (commit) via 4ab08712c30e6167b74dc3f48d1ec094b38e0e9d (commit) via 891592c50a8908b637b7d571bc638111280878bf (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (3e18adb7766fe04dd2af08687c91ced6ac4d2544) \ N -- N -- N (c7377326ecc199de24aab7826123996c4cbd040e) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-exog-actions Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 02408505413a31baeb56aaa0a12c737bf2c4a3a7 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 8 12:56:43 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 18 18:52:21 2018 +0200 clips-executive: add the operator to domain preconditions In some cases, we need to refer to the operator of a nested/atomic precondition. Add a slot operator that
[Fawkes Git] branch/common/current: 3 revs updated. (1.0.1-1010-g139cd8f)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 139cd8f06513dc1c842806c9374308cb0ac693fc (commit) via 1bbf733c8c1faa3dd47c17b7f9c242558506b6f5 (commit) via 57f686ea145d2a2fa686d58fb76a3f8a675a8bb9 (commit) from 023ff84c1b82738cdb99cb3305dc6cf847e3a7c1 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 139cd8f06513dc1c842806c9374308cb0ac693fc Merge: 023ff84 1bbf733 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Apr 17 18:58:35 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Apr 17 18:58:35 2018 +0200 Merge remote-tracking branch 'origin/vmatare/laser-lines-tf-sync' into current http://git.fawkesrobotics.org/fawkes.git/commit/139cd8f http://trac.fawkesrobotics.org/changeset/139cd8f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../laser-lines/interfaces/LaserLineInterface.cpp | 77 +++- .../interfaces/LaserLineInterface.h_ext| 12 +++ .../interfaces/LaserLineInterface.tolua|6 ++ .../laser-lines/interfaces/LaserLineInterface.xml |6 ++ src/plugins/laser-lines/laser-lines-thread.cpp | 36 +++--- src/plugins/laser-lines/laser-lines-thread.h |2 +- 6 files changed, 125 insertions(+), 14 deletions(-) - *Diffs* - - *commit* 139cd8f06513dc1c842806c9374308cb0ac693fc - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Tue Apr 17 18:58:35 2018 +0200 Subject: Merge remote-tracking branch 'origin/vmatare/laser-lines-tf-sync' into current .../laser-lines/interfaces/LaserLineInterface.cpp | 77 +++- .../interfaces/LaserLineInterface.h_ext| 12 +++ .../interfaces/LaserLineInterface.tolua|6 ++ .../laser-lines/interfaces/LaserLineInterface.xml |6 ++ src/plugins/laser-lines/laser-lines-thread.cpp | 36 +++--- src/plugins/laser-lines/laser-lines-thread.h |2 +- 6 files changed, 125 insertions(+), 14 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/clips-executive-adapt-pddl-to-goal-extensions: created (1.0.1-680-gd4f1c07)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/clips-executive-adapt-pddl-to-goal-extensions has been created at d4f1c0757a8d005c6b823254408bc36f7eb0e328 (commit) http://git.fawkesrobotics.org/fawkes.git/common/clips-executive-adapt-pddl-to-goal-extensions - *Log* --- commit d4f1c0757a8d005c6b823254408bc36f7eb0e328 Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 15 18:09:08 2018 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Apr 18 20:15:53 2018 +0200 clips-executive: adapt pddl.clp to goal extensions http://git.fawkesrobotics.org/fawkes.git/commit/d4f1c07 http://trac.fawkesrobotics.org/changeset/d4f1c07 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- - *Diffs* - - *commit* d4f1c0757a8d005c6b823254408bc36f7eb0e328 - - - - - - - - - - Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> Date:Thu Mar 15 18:09:08 2018 +0100 Subject: clips-executive: adapt pddl.clp to goal extensions src/plugins/clips-executive/clips/pddl.clp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/pddl.clp b/src/plugins/clips-executive/clips/pddl.clp index 9d86184..727dec4 100644 --- a/src/plugins/clips-executive/clips/pddl.clp +++ b/src/plugins/clips-executive/clips/pddl.clp @@ -91,7 +91,7 @@ (success FALSE)) => (printout error "Planning failed for goal " ?goal-id crlf) - (modify ?g (mode FAILED)) + (modify ?g (mode FINISHED) (outcome FAILED) ) (retract ?p) ) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/mgomaa/clips-executive-adapt-goal-extensions-pddl: deleted (1.0.1-716-g5863a06)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, mgomaa/clips-executive-adapt-goal-extensions-pddl has been deleted was 5863a063a4fd2b2d787f8a8af91e33c609edb7ee 5863a063a4fd2b2d787f8a8af91e33c609edb7ee clips-executive: adapt pddl.clp to goal extensions -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/clips-executive-exog-actions: 2 revs updated. (1.0.1-732-gfe3ba2a)
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/clips-executive-exog-actions has been updated
to fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee (commit)
via a6bce362c09c8065a8df06cdd65d72f33594eb5c (commit)
from c7377326ecc199de24aab7826123996c4cbd040e (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/clips-executive-exog-actions
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit a6bce362c09c8065a8df06cdd65d72f33594eb5c
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Sat Apr 21 18:42:12 2018 +0200
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Sat Apr 21 18:42:12 2018 +0200
clips-pddl-parser: also parse disjunctive preconditions
http://git.fawkesrobotics.org/fawkes.git/commit/a6bce36
http://trac.fawkesrobotics.org/changeset/a6bce36
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Sat Apr 21 18:43:24 2018 +0200
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Sat Apr 21 18:43:24 2018 +0200
lib pddl parser: mention disjunctions in the documentation
We don't actually need to add any code to support disjunctions in the
parser, but mention it in the documentation.
http://git.fawkesrobotics.org/fawkes.git/commit/fe3ba2a
http://trac.fawkesrobotics.org/changeset/fe3ba2a
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/libs/pddl_parser/pddl_ast.h|2 +-
.../clips-pddl-parser/precondition_visitor.cpp |4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
- *Diffs* -
- *commit* a6bce362c09c8065a8df06cdd65d72f33594eb5c - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Sat Apr 21 18:42:12 2018 +0200
Subject: clips-pddl-parser: also parse disjunctive preconditions
.../clips-pddl-parser/precondition_visitor.cpp |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/clips-pddl-parser/precondition_visitor.cpp
b/src/plugins/clips-pddl-parser/precondition_visitor.cpp
index 29ea91d..6fb7f54 100644
--- a/src/plugins/clips-pddl-parser/precondition_visitor.cpp
+++ b/src/plugins/clips-pddl-parser/precondition_visitor.cpp
@@ -67,10 +67,12 @@ PreconditionToCLIPSFactVisitor::operator()(Predicate )
const {
stringstream namestream;
namestream << parent_ << sub_counter_;
string name = namestream.str();
- if (p.function == "and" || p.function == "not") {
+ if (p.function == "and" || p.function == "not" || p.function == "or") {
string type;
if (p.function == "and") {
type = "conjunction";
+} else if (p.function == "or") {
+ type = "disjunction";
} else if (p.function == "not") {
type = "negation";
}
- *commit* fe3ba2a9d6805bed801a52848061eaf8ac2ae6ee - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Sat Apr 21 18:43:24 2018 +0200
Subject: lib pddl parser: mention disjunctions in the documentation
src/libs/pddl_parser/pddl_ast.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
_Diff for modified files_:
diff --git a/src/libs/pddl_parser/pddl_ast.h b/src/libs/pddl_parser/pddl_ast.h
index 56087ee..3ead9fd 100644
--- a/src/libs/pddl_parser/pddl_ast.h
+++ b/src/libs/pddl_parser/pddl_ast.h
@@ -59,7 +59,7 @@ namespace pddl_parser {
struct Predicate
{
/** The name of the predicate for atomic formulae, 'and' for a conjunction,
- * 'not' for a negation.
+ * 'or' for a disjunction, 'not' for a negation.
*/
Atom function;
/** The arguments of the predicate or the subformulae of the compound
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 2 revs updated. (1.0.1-1043-g81a4801)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 81a48016b5a705e57ed8cace49f7fcaf560bee73 (commit) via c170badd0b4c50a0aea105d390452d2a5eec2b60 (commit) from 4225d71299a2c678c4e0772330df67aa59fb0636 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 81a48016b5a705e57ed8cace49f7fcaf560bee73 Merge: 4225d71 c170bad Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sat Apr 21 18:11:26 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sat Apr 21 18:11:26 2018 +0200 Merge remote-tracking branch 'origin/vmatare/conservative-default-build' into current http://git.fawkesrobotics.org/fawkes.git/commit/81a4801 http://trac.fawkesrobotics.org/changeset/81a4801 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- etc/buildsys/btypes/config_fawkes.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* - - *commit* 81a48016b5a705e57ed8cace49f7fcaf560bee73 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Sat Apr 21 18:11:26 2018 +0200 Subject: Merge remote-tracking branch 'origin/vmatare/conservative-default-build' into current etc/buildsys/btypes/config_fawkes.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/master: plugins: add missing dependency of stn-generator on pddl-planner
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, master has been updated to d1af20542448bb9bd137b8d3380b1ccf57c9c7a0 (commit) from 7a2458b8d95d6190f7dd5fa32053e5f904d49303 (commit) http://git.fawkesrobotics.org/fawkes.git/master Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit d1af20542448bb9bd137b8d3380b1ccf57c9c7a0 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Apr 16 14:23:54 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Apr 16 14:23:54 2018 +0200 plugins: add missing dependency of stn-generator on pddl-planner http://git.fawkesrobotics.org/fawkes.git/commit/d1af205 http://trac.fawkesrobotics.org/changeset/d1af205 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- src/plugins/Makefile |1 + 1 files changed, 1 insertions(+), 0 deletions(-) - *Diffs* - - *commit* d1af20542448bb9bd137b8d3380b1ccf57c9c7a0 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Mon Apr 16 14:23:54 2018 +0200 Subject: plugins: add missing dependency of stn-generator on pddl-planner src/plugins/Makefile |1 + 1 files changed, 1 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/Makefile b/src/plugins/Makefile index ec3b722..6dc2d11 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -55,4 +55,5 @@ perception: mongodb navgraph-generator: navgraph amcl openprs-agent: openprs laser-filter: amcl +stn-generator: pddl-planner -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/remove-generated-interfaces: created (1.0.1-722-g9f1d57c)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/remove-generated-interfaces has been created at 9f1d57c52940a87fd7352d0c6d60f700150cae6c (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/remove-generated-interfaces - *Log* --- commit 6d8627fa0807b1b30d035e35f4d3d02e60e3bc88 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Apr 16 16:10:46 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Apr 16 16:10:46 2018 +0200 pddl-robot-memory: remove generated interface cpp If we keep the cpp in the repository but remove the header, the header is not regenerated. As we have removed the header previously, we also need to remove the cpp. http://git.fawkesrobotics.org/fawkes.git/commit/6d8627f http://trac.fawkesrobotics.org/changeset/6d8627f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9f1d57c52940a87fd7352d0c6d60f700150cae6c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Apr 16 16:11:54 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Apr 16 16:11:54 2018 +0200 pddl-planner: remove generated interface cpp If we keep the cpp in the repository but remove the header, the header is not regenerated. As we have removed the header previously, we also need to remove the cpp. http://git.fawkesrobotics.org/fawkes.git/commit/9f1d57c http://trac.fawkesrobotics.org/changeset/9f1d57c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../interfaces/PddlPlannerInterface.cpp| 319 1 files changed, 0 insertions(+), 319 deletions(-) delete mode 100644 src/plugins/pddl-planner/interfaces/PddlPlannerInterface.cpp - *Diffs* - - *commit* 6d8627fa0807b1b30d035e35f4d3d02e60e3bc88 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Mon Apr 16 16:10:46 2018 +0200 Subject: pddl-robot-memory: remove generated interface cpp .../interfaces/PddlGenInterface.cpp| 283 1 files changed, 0 insertions(+), 283 deletions(-) - *commit* 9f1d57c52940a87fd7352d0c6d60f700150cae6c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Mon Apr 16 16:11:54 2018 +0200 Subject: pddl-planner: remove generated interface cpp .../interfaces/PddlPlannerInterface.cpp| 319 1 files changed, 0 insertions(+), 319 deletions(-) -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/thofmann/laser-filter-copy: laser-filter: initialize copy filter if filter type is 'copy'
Changes have been pushed for the repository "fawkes.git".
(Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git
Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac: http://trac.fawkesrobotics.org
The branch, thofmann/laser-filter-copy has been updated
to f90ba75fcc12d2383053255a7429ec7c30d154aa (commit)
from 98f1c99cc0a072806ba476b2c150b2f6371d92d3 (commit)
http://git.fawkesrobotics.org/fawkes.git/thofmann/laser-filter-copy
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- *Log* ---
commit f90ba75fcc12d2383053255a7429ec7c30d154aa
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
AuthorDate: Mon Apr 16 14:37:00 2018 +0200
Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
CommitDate: Mon Apr 16 14:37:00 2018 +0200
laser-filter: initialize copy filter if filter type is 'copy'
http://git.fawkesrobotics.org/fawkes.git/commit/f90ba75
http://trac.fawkesrobotics.org/changeset/f90ba75
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *Summary* ---
src/plugins/laser-filter/filter_thread.cpp |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
- *Diffs* -
- *commit* f90ba75fcc12d2383053255a7429ec7c30d154aa - - - - - - - - - -
Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de>
Date:Mon Apr 16 14:37:00 2018 +0200
Subject: laser-filter: initialize copy filter if filter type is 'copy'
src/plugins/laser-filter/filter_thread.cpp |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
_Diff for modified files_:
diff --git a/src/plugins/laser-filter/filter_thread.cpp
b/src/plugins/laser-filter/filter_thread.cpp
index e13ed9f..a707794 100644
--- a/src/plugins/laser-filter/filter_thread.cpp
+++ b/src/plugins/laser-filter/filter_thread.cpp
@@ -20,6 +20,7 @@
*/
#include "filter_thread.h"
+#include "filters/copy.h"
#include "filters/max_circle.h"
#include "filters/720to360.h"
#include "filters/1080to360.h"
@@ -429,7 +430,9 @@ LaserFilterThread::create_filter(std::string filter_name,
unsigned int in_data_size,
std::vector
)
{
- if (filter_type == "720to360") {
+ if (filter_type == "copy") {
+return new LaserCopyDataFilter(filter_name, in_data_size, inbufs);
+ } else if (filter_type == "720to360") {
bool average = false;
try {
average = config->get_bool((prefix + "average").c_str());
--
Fawkes Robotics Framework http://www.fawkesrobotics.org
___
fawkes-commits mailing list
fawkes-commits@lists.kbsg.rwth-aachen.de
https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
[Fawkes Git] branch/common/current: 3 revs updated. (1.0.1-1007-g023ff84)
Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework) Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated to 023ff84c1b82738cdb99cb3305dc6cf847e3a7c1 (commit) via 9f1d57c52940a87fd7352d0c6d60f700150cae6c (commit) via 6d8627fa0807b1b30d035e35f4d3d02e60e3bc88 (commit) from e8b216169711da3d90a5dda8dd3b5d55782a46a5 (commit) http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --- commit 023ff84c1b82738cdb99cb3305dc6cf847e3a7c1 Merge: e8b2161 9f1d57c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Apr 16 16:13:18 2018 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Mon Apr 16 16:13:18 2018 +0200 Merge remote-tracking branch 'origin/thofmann/remove-generated-interfaces' into current http://git.fawkesrobotics.org/fawkes.git/commit/023ff84 http://trac.fawkesrobotics.org/changeset/023ff84 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* --- .../interfaces/PddlPlannerInterface.cpp| 272 --- .../interfaces/PddlGenInterface.cpp| 285 2 files changed, 0 insertions(+), 557 deletions(-) delete mode 100644 src/plugins/pddl-planner/interfaces/PddlPlannerInterface.cpp delete mode 100644 src/plugins/pddl-robot-memory/interfaces/PddlGenInterface.cpp - *Diffs* - - *commit* 023ff84c1b82738cdb99cb3305dc6cf847e3a7c1 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date:Mon Apr 16 16:13:18 2018 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/remove-generated-interfaces' into current .../interfaces/PddlPlannerInterface.cpp| 272 --- .../interfaces/PddlGenInterface.cpp| 285 2 files changed, 0 insertions(+), 557 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org ___ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
