[Fawkes Git] branch/bschaepers/asp-aspect: 3 revs updated. (0.5.0-3380-g2d24279)

Bjoern Schaepers bjoern.schaepers at rwth-aachen.de
Wed Nov 23 19:27:04 CET 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, bschaepers/asp-aspect has been updated
        to  2d2427904bcf3ce87ee43a25405e178704dd3683 (commit)
       via  3457738aea5417e69eae233c75936e1b5322bfcb (commit)
       via  78dcd9dcc6ae8ef57e0b68585584b24297aeadb1 (commit)
      from  16df52d8b40c32073247705bea0b3a7ff972b933 (commit)

http://git.fawkesrobotics.org/fawkes.git/bschaepers/asp-aspect

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 78dcd9dcc6ae8ef57e0b68585584b24297aeadb1
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 23 19:22:36 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 23 19:22:36 2016 +0100

    ASP-Aspect: Use the cmake version of clingo.
    
    Build out of sources.

http://git.fawkesrobotics.org/fawkes.git/commit/78dcd9d
http://trac.fawkesrobotics.org/changeset/78dcd9d

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 3457738aea5417e69eae233c75936e1b5322bfcb
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 23 19:23:44 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 23 19:24:46 2016 +0100

    ASP-Aspect: Use correct function for atom to string transformation.
    
    .string() gives an ASP-string, but we want a printable string, that is
    .to_string(), also convert this to char*, because the fawkes logger can't
    print std::strings.

http://git.fawkesrobotics.org/fawkes.git/commit/3457738
http://trac.fawkesrobotics.org/changeset/3457738

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 2d2427904bcf3ce87ee43a25405e178704dd3683
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Wed Nov 23 19:26:06 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Wed Nov 23 19:26:06 2016 +0100

    ASP-Aspect: Use the lambda.
    
    Don't try to print it, this doesn't work!

http://git.fawkesrobotics.org/fawkes.git/commit/2d24279
http://trac.fawkesrobotics.org/changeset/2d24279

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/plugins/asp/Makefile                 |    2 +-
 src/plugins/asp/aspect/clingo_access.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 78dcd9dcc6ae8ef57e0b68585584b24297aeadb1 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 23 19:22:36 2016 +0100
Subject: ASP-Aspect: Use the cmake version of clingo.

 src/plugins/asp/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/Makefile b/src/plugins/asp/Makefile
index 9df80ff..09234fe 100644
--- a/src/plugins/asp/Makefile
+++ b/src/plugins/asp/Makefile
@@ -31,7 +31,7 @@ CFLAGS_CLINGO = -DWITH_THREADS=1 \
 	-I $(HOME)/clingo/libgringo \
 	-I $(HOME)/clingo/liblp \
 	-I $(HOME)/clingo/libprogram_opts
-LDFLAGS_CLINGO = -L$(HOME)/clingo/build/debug/ -Wl,-rpath=$(HOME)/clingo/build/debug/ -lclingo
+LDFLAGS_CLINGO = -L$(HOME)/clingo-build/bin/ -Wl,-rpath=$(HOME)/clingo-build/bin/ -lclingo
 
 # Extra files for system-wide install, i.e., "make install"
 #FILES_clips_files   = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/clips/*.clp))

- *commit* 3457738aea5417e69eae233c75936e1b5322bfcb - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 23 19:23:44 2016 +0100
Subject: ASP-Aspect: Use correct function for atom to string transformation.

 src/plugins/asp/aspect/clingo_access.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/aspect/clingo_access.cpp b/src/plugins/asp/aspect/clingo_access.cpp
index fd4a60e..155a39f 100644
--- a/src/plugins/asp/aspect/clingo_access.cpp
+++ b/src/plugins/asp/aspect/clingo_access.cpp
@@ -380,7 +380,7 @@ ClingoAccess::assign_external(const Clingo::Symbol atom, const Clingo::TruthValu
 					case Clingo::TruthValue::False : ret = "False"; break;
 				} //switch ( value )
 				return ret;
-			}, atom.string());
+			}, atom.to_string().c_str());
 	} //if ( Debug )
 	Control.assign_external(atom, value);
 	return true;
@@ -402,7 +402,7 @@ ClingoAccess::release_external(const Clingo::Symbol atom)
 
 	if ( Debug )
 	{
-		Log->log_info(LogComponent.c_str(), "Releasing %s.", atom.string());
+		Log->log_info(LogComponent.c_str(), "Releasing %s.", atom.to_string().c_str());
 	} //if ( Debug )
 	Control.release_external(atom);
 	return true;

- *commit* 2d2427904bcf3ce87ee43a25405e178704dd3683 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Wed Nov 23 19:26:06 2016 +0100
Subject: ASP-Aspect: Use the lambda.

 src/plugins/asp/aspect/clingo_access.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/aspect/clingo_access.cpp b/src/plugins/asp/aspect/clingo_access.cpp
index 155a39f..63bddaf 100644
--- a/src/plugins/asp/aspect/clingo_access.cpp
+++ b/src/plugins/asp/aspect/clingo_access.cpp
@@ -380,7 +380,7 @@ ClingoAccess::assign_external(const Clingo::Symbol atom, const Clingo::TruthValu
 					case Clingo::TruthValue::False : ret = "False"; break;
 				} //switch ( value )
 				return ret;
-			}, atom.to_string().c_str());
+			}(), atom.to_string().c_str());
 	} //if ( Debug )
 	Control.assign_external(atom, value);
 	return true;




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list