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-wm-config has been updated discards e44f9511aad14ea5484ca93cd2e6f1924c32abb8 (commit) to 8b55008da8e3fd16f7ef10a3b688a21af528a860 (commit) via ac9a47095011b6fd39242ca74dbeb001f981aa60 (commit) via 435de5aef81616e8dd3d568b75b8895f0cecb278 (commit) via 44cec6f9f81437dddd8f61c54c92e37a3ef7375a (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 (e44f9511aad14ea5484ca93cd2e6f1924c32abb8) \ N -- N -- N (8b55008da8e3fd16f7ef10a3b688a21af528a860) 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/clips-executive-wm-config 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 44cec6f9f81437dddd8f61c54c92e37a3ef7375a Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> AuthorDate: Mon Jan 8 10:16:18 2018 +0100 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 17:59:17 2018 +0100 clips-executive: conversion of parameters to worldmodel facts Convert configuration values in the parameters sub-tree of the spec config into world model facts in the /config tree. http://git.fawkesrobotics.org/fawkes.git/commit/44cec6f http://trac.fawkesrobotics.org/changeset/44cec6f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 435de5aef81616e8dd3d568b75b8895f0cecb278 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 17:55:58 2018 +0100 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 18:00:18 2018 +0100 clips: add str-prefix utility function Allows to determine whether a string has a specified prefix. http://git.fawkesrobotics.org/fawkes.git/commit/435de5a http://trac.fawkesrobotics.org/changeset/435de5a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit ac9a47095011b6fd39242ca74dbeb001f981aa60 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 17:56:27 2018 +0100 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 18:00:18 2018 +0100 clips-executive: update and fix configuration conversion Check for proper prefix, not just whether the prefix is contained somewhere. Rename parameter space to parameters in config as discussed. Remove unused code. http://git.fawkesrobotics.org/fawkes.git/commit/ac9a470 http://trac.fawkesrobotics.org/changeset/ac9a470 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 8b55008da8e3fd16f7ef10a3b688a21af528a860 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Thu Jan 11 17:58:41 2018 +0100 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Thu Jan 11 18:00:18 2018 +0100 config: add clips-executive example parameter http://git.fawkesrobotics.org/fawkes.git/commit/8b55008 http://trac.fawkesrobotics.org/changeset/8b55008 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/clips-executive.yaml | 7 ++++ src/plugins/clips-executive/clips/wm-config.clp | 37 +++++++--------------- src/plugins/clips/clips/utils.clp | 10 ++++++ 3 files changed, 29 insertions(+), 25 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 44cec6f9f81437dddd8f61c54c92e37a3ef7375a - - - - - - - - - - Author: Mostafa Gomaa <go...@kbsg.rwth-aachen.de> Date: Mon Jan 8 10:16:18 2018 +0100 Subject: clips-executive: conversion of parameters to worldmodel facts src/plugins/clips-executive/clips/init.clp | 1 + src/plugins/clips-executive/clips/wm-config.clp | 35 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/init.clp b/src/plugins/clips-executive/clips/init.clp index 4f4d7e0..42c258f 100644 --- a/src/plugins/clips-executive/clips/init.clp +++ b/src/plugins/clips-executive/clips/init.clp @@ -116,6 +116,7 @@ (path-load "domain.clp") (path-load "worldmodel.clp") (path-load "wm-domain-sync.clp") + (path-load "wm-config.clp") (path-load "blackboard-init.clp") (path-load "skills-init.clp") ) - *commit* 435de5aef81616e8dd3d568b75b8895f0cecb278 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Thu Jan 11 17:55:58 2018 +0100 Subject: clips: add str-prefix utility function src/plugins/clips/clips/utils.clp | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips/clips/utils.clp b/src/plugins/clips/clips/utils.clp index 6de5ae1..be95cfd 100644 --- a/src/plugins/clips/clips/utils.clp +++ b/src/plugins/clips/clips/utils.clp @@ -70,3 +70,13 @@ ; @param ?b string b to compare ; @return true if (str-compare ?a ?b) is greater than thero, false otherwise (deffunction string> (?a ?b) (> (str-compare ?a ?b) 0)) + +(deffunction str-prefix (?prefix ?s) + "Check if ?s starts with ?prefix + @param ?s string to check + @param ?prefix string to check for in ?s + @return TRUE if ?s starts with ?prefix, FALSE otherwise" + (bind ?p (str-index ?prefix ?s)) + (if ?p then (return (= ?p 1))) + (return FALSE) +) - *commit* ac9a47095011b6fd39242ca74dbeb001f981aa60 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Thu Jan 11 17:56:27 2018 +0100 Subject: clips-executive: update and fix configuration conversion src/plugins/clips-executive/clips/wm-config.clp | 37 +++++++--------------- 1 files changed, 12 insertions(+), 25 deletions(-) _Diff for modified files_: diff --git a/src/plugins/clips-executive/clips/wm-config.clp b/src/plugins/clips-executive/clips/wm-config.clp index 36bb444..6a78913 100644 --- a/src/plugins/clips-executive/clips/wm-config.clp +++ b/src/plugins/clips-executive/clips/wm-config.clp @@ -3,33 +3,20 @@ ; wm-config.clp - CLIPS executive ; ; Created: Tue Jan 5 18:39 2017 -; Copyright 2012-2017 Mostafa Gomaa [go...@kbsg.rwth-aachen.de] +; Copyright 2012-2017 Mostafa Gomaa <go...@kbsg.rwth-aachen.de> ; Licensed under GPLv2+ license, cf. LICENSE file ;--------------------------------------------------------------------------- -; (defglobal -; ?*WM_CONFIG_PREFIX* = "?" -; ) - -; (defrule wm-config-compute-config-prefix -; "Set the prefix of wm-config as a global" -; (executive-init) -; (confval (path "/clips-executive/spec") (type STRING) (value ?spec)) -; => -; (bind ?*WM_CONFIG_PREFIX* (str-cat "/clips-executive/specs/" ?spec "/wm-config/")) -; ) - (defrule wm-config-load-from-confval - "Convert worldmodel related confval into wm-fact representation." - (executive-init) + "Convert parameters from configuration to world model facts" + (executive-init) (confval (path "/clips-executive/spec") (type STRING) (value ?spec)) - ?conf <- (confval (path ?path&:(str-index (str-cat "/clips-executive/specs/" ?spec "/wm-config/") ?path)) - (type ?type) (value ?value) (is-list ?is-list) (list-value $?list-value)) - => - (bind ?wm-config-prefix (str-cat "/clips-executive/specs/" ?spec "/wm-config/")) - (bind ?wm-config-postfix (sub-string (str-length ?wm-config-prefix) (str-length ?path) ?path)) - (bind ?id (str-cat "/config" ?wm-config-postfix)) - (assert (wm-fact (id ?id) (type ?type) (value ?value) (is-list ?is-list) (values ?list-value) ) ) - (retract ?conf) - ) - + ?cf <- (confval (path ?path&:(str-prefix (str-cat "/clips-executive/specs/" ?spec "/parameters/") ?path)) + (type ?type) (value ?value) (is-list ?is-list) (list-value $?list-value)) + => + (bind ?prefix (str-cat "/clips-executive/specs/" ?spec "/parameters/")) + (bind ?name (sub-string (str-length ?prefix) (str-length ?path) ?path)) + (bind ?id (str-cat "/config" ?name)) + (assert (wm-fact (id ?id) (type ?type) (value ?value) (is-list ?is-list) (values ?list-value))) + (retract ?cf) +) - *commit* 8b55008da8e3fd16f7ef10a3b688a21af528a860 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Thu Jan 11 17:58:41 2018 +0100 Subject: config: add clips-executive example parameter cfg/conf.d/clips-executive.yaml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/cfg/conf.d/clips-executive.yaml b/cfg/conf.d/clips-executive.yaml index b51e37b..c6d7294 100644 --- a/cfg/conf.d/clips-executive.yaml +++ b/cfg/conf.d/clips-executive.yaml @@ -74,3 +74,10 @@ clips-executive: # code is loaded. That avoid the necessity of splitting interface opening # and processing in user code. #blackboard-preload: ["Position3DInterface"] + + # Values in the parameters subtree will be added to the "/config" tree + # in the world model facts. Everything up until and including /parameters/ + # in the configuration path is removed. + # Example: /clips-executive/specs/test/parameters/home-pos -> /config/home-pos + parameters: + example: value -- 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
