temporal

aig-upf · Dec 18, 2017 · 7bc0a83 · 7bc0a83
1 parent 00e8613
commit 7bc0a83
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/parser/TemporalAction.cpp b/parser/TemporalAction.cpp
@@ -233,22 +233,16 @@ void TemporalAction::parse( Filereader & f, TokenStruct< std::string > & ts, Dom
 	f.assert_token( ")" );
 }
 
-CondVec TemporalAction::preconsOverall() {
-	And * a = dynamic_cast< And * >( pre_o );
-	if ( a ) return a->conds;
-
-	CondVec precons;
-	if ( pre_o ) precons.push_back( pre_o );
-	return precons;
+GroundVec TemporalAction::preconsStart() {
+	return getGroundsFromCondition( pre, false );
 }
 
-CondVec TemporalAction::preconsEnd() {
-	And * a = dynamic_cast< And * >( pre_e );
-	if ( a ) return a->conds;
+GroundVec TemporalAction::preconsOverall() {
+	return getGroundsFromCondition( pre_o, false );
+}
 
-	CondVec precons;
-	if ( pre_e ) precons.push_back( pre_e );
-	return precons;
+GroundVec TemporalAction::preconsEnd() {
+	return getGroundsFromCondition( pre_e, false );
 }
 
 GroundVec TemporalAction::addEndEffects() {

diff --git a/parser/TemporalAction.h b/parser/TemporalAction.h
@@ -182,9 +182,11 @@ class TemporalAction : public Action {
 
 	void parse( Filereader & f, TokenStruct< std::string > & ts, Domain & d );
 
-	CondVec preconsOverall();
+	GroundVec preconsStart();
 
-	CondVec preconsEnd();
+	GroundVec preconsOverall();
+
+	GroundVec preconsEnd();
 
 	GroundVec addEndEffects();