Merges #9, #13, #15, #24, fixes #21, #34

.gitignore

@@ -0,0 +1,34 @@
+# Git ignore file
+*~
+#*
+
+*.o
+*.dSYM
+
+# This file is generated
+src/pddl+.cpp
+src/pddl+.lcc
+
+
+**/parser
+**/validate
+**/tan
+**/analyse
+**/dyna
+**/dynaplan
+**/hww
+**/instantiate
+**/libInst.a
+**/pddl2lpgp
+**/pinguplan
+**/planrec
+**/relax
+**/tim
+**/tofn
+**/typestrip
+
+
+**/GPATH
+**/GRTAGS
+**/GTAGS
+

Makefile

@@ -2,6 +2,7 @@
 # Do not edit it directly!
 # Any changes you make will be silently overwritten.
 
+.PHONY : test
 
 # Edit this file to define constants and custom build targets.
 # Please refer to the makemake documentation for more information.
@@ -12,15 +13,14 @@
 # Useful directories
 
 MYCODEDIR := include
-PARSER := src/Parser
 
 # Directories to search for header files
 
-SEARCHDIRS := -I${MYCODEDIR} -I${PARSER}
+SEARCHDIRS := -I${MYCODEDIR}
 
 # makemake variables
 
-DEPENDFLAGS := -g -Wall -Werror ${SEARCHDIRS}
+DEPENDFLAGS := -g -Wall ${SEARCHDIRS}
 
 # C preprocessor (C, C++, FORTRAN)
 
@@ -39,6 +39,16 @@ CFLAGS  = ${DEPENDFLAGS}
 CXX      ?= g++
 CXXFLAGS  = ${DEPENDFLAGS} -ansi -Wall
 
+# C/C++/Eiffel/FORTRAN linker
+
+LINKER    := $(CXX) -g
+LDFLAGS    = 
+LOADLIBES := 
+
+# LEX generator
+LEX	?= flex
+YACC	?= bison
+
 %.o : %.cc
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $< -o $@
 
@@ -52,24 +62,14 @@ CXXFLAGS  = ${DEPENDFLAGS} -ansi -Wall
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $< -o $@
 
 %.cpp : %.yacc
-	flex -+ src/Parser/pddl+.lex -o /src/Parser/lex.yy.cc; bison $< -o src/pddl+.cpp
-
-
-
-# C/C++/Eiffel/FORTRAN linker
-
-LINKER    := g++ -g 
-LDFLAGS    = 
-LOADLIBES := 
-
-
-
-# This is what makemake added
+	${YACC} -o $@ $<
 
+%.lcc : %.lex
+	${LEX} -+ -o $@ $<
 
 # validate
 
-validate :: src/pddl+.o src/pddl+.o src/ptree.o src/Action.o src/Proposition.o src/FuncExp.o src/typecheck.o src/main.o src/Validator.o src/RepairAdvice.o src/LaTeXSupport.o src/State.o src/Plan.o src/Ownership.o src/Environment.o src/Polynomial.o src/DebugWriteController.o src/Utils.o src/TrajectoryConstraints.o src/RobustAnalyse.o src/random.o src/Events.o src/PrettyPrinter.o
+validate :: src/pddl+.o src/ptree.o src/Action.o src/Proposition.o src/FuncExp.o src/typecheck.o src/main.o src/Validator.o src/RepairAdvice.o src/LaTeXSupport.o src/State.o src/Plan.o src/Ownership.o src/Environment.o src/Polynomial.o src/DebugWriteController.o src/Utils.o src/TrajectoryConstraints.o src/RobustAnalyse.o src/random.o src/Events.o src/PrettyPrinter.o
   ifeq (${suffix validate}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -83,7 +83,7 @@ validate :: src/pddl+.o src/pddl+.o src/ptree.o src/Action.o src/Proposition.o s
 
 # parser
 
-parser :: src/pddl+.o src/pddl+.o src/ptree.o src/parse.o src/DebugWriteController.o
+parser :: src/pddl+.o src/ptree.o src/parse.o src/DebugWriteController.o
   ifeq (${suffix parser}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -97,7 +97,7 @@ parser :: src/pddl+.o src/pddl+.o src/ptree.o src/parse.o src/DebugWriteControll
 
 # analyse
 
-analyse :: src/pddl+.o src/pddl+.o src/ptree.o src/Analysis.o src/DebugWriteController.o
+analyse :: src/pddl+.o src/ptree.o src/Analysis.o src/DebugWriteController.o
   ifeq (${suffix analyse}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -111,7 +111,7 @@ analyse :: src/pddl+.o src/pddl+.o src/ptree.o src/Analysis.o src/DebugWriteCont
 
 # tan
 
-tan :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalysis.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/FuncAnalysis.o
+tan :: src/pddl+.o src/ptree.o src/TypedAnalysis.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/FuncAnalysis.o
   ifeq (${suffix tan}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -125,7 +125,7 @@ tan :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalysis.o src/TypedAnalyser
 
 # tim
 
-tim :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/TIMMain.o src/SimpleEval.o src/instantiation.o
+tim :: src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/TIMMain.o src/SimpleEval.o src/instantiation.o
   ifeq (${suffix tim}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -139,7 +139,7 @@ tim :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteCon
 
 # tofn
 
-tofn :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/ToFunction.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/SASActions.o src/ToFnMain.o
+tofn :: src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/ToFunction.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/SASActions.o src/ToFnMain.o
   ifeq (${suffix tofn}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -153,7 +153,7 @@ tofn :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteCo
 
 # instantiate
 
-instantiate :: src/pddl+.o src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/instantiationMain.o src/DebugWriteController.o src/typecheck.o src/TypedAnalyser.o src/FuncAnalysis.o src/TIM.o src/TimSupport.o
+instantiate :: src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/instantiationMain.o src/DebugWriteController.o src/typecheck.o src/TypedAnalyser.o src/FuncAnalysis.o src/TIM.o src/TimSupport.o
   ifeq (${suffix instantiate}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -167,7 +167,7 @@ instantiate :: src/pddl+.o src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvi
 
 # libInst.a
 
-libInst.a :: src/pddl+.o src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/DebugWriteController.o src/typecheck.o src/TypedAnalyser.o src/FuncAnalysis.o src/TIM.o src/TimSupport.o src/TypeStripWC.o src/TypeStrip.o
+libInst.a :: src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/DebugWriteController.o src/typecheck.o src/TypedAnalyser.o src/FuncAnalysis.o src/TIM.o src/TimSupport.o src/TypeStripWC.o src/TypeStrip.o
   ifeq (${suffix libInst.a}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -181,7 +181,7 @@ libInst.a :: src/pddl+.o src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnviro
 
 # typestrip
 
-typestrip :: src/pddl+.o src/pddl+.o src/ptree.o src/TypeStrip.o src/TypeStripWC.o src/typecheck.o src/DebugWriteController.o
+typestrip :: src/pddl+.o src/ptree.o src/TypeStrip.o src/TypeStripWC.o src/typecheck.o src/DebugWriteController.o
   ifeq (${suffix typestrip}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -195,7 +195,7 @@ typestrip :: src/pddl+.o src/pddl+.o src/ptree.o src/TypeStrip.o src/TypeStripWC
 
 # pddl2lpgp
 
-pddl2lpgp :: src/pddl+.o src/pddl+.o src/ptree.o src/LPGPTranslator.o src/LPGP.o src/DebugWriteController.o src/Utils.o
+pddl2lpgp :: src/pddl+.o src/ptree.o src/LPGPTranslator.o src/LPGP.o src/DebugWriteController.o src/Utils.o
   ifeq (${suffix pddl2lpgp}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -209,7 +209,7 @@ pddl2lpgp :: src/pddl+.o src/pddl+.o src/ptree.o src/LPGPTranslator.o src/LPGP.o
 
 # dyna
 
-dyna :: src/pddl+.o src/pddl+.o src/ptree.o src/DYNATranslator.o src/DYNA.o src/DebugWriteController.o src/Utils.o
+dyna :: src/pddl+.o src/ptree.o src/DYNATranslator.o src/DYNA.o src/DebugWriteController.o src/Utils.o
   ifeq (${suffix dyna}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -223,7 +223,7 @@ dyna :: src/pddl+.o src/pddl+.o src/ptree.o src/DYNATranslator.o src/DYNA.o src/
 
 # relax
 
-relax :: src/pddl+.o src/pddl+.o src/ptree.o src/RelaxTranslator.o src/Relax.o src/DebugWriteController.o src/Utils.o
+relax :: src/pddl+.o src/ptree.o src/RelaxTranslator.o src/Relax.o src/DebugWriteController.o src/Utils.o
   ifeq (${suffix relax}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -237,7 +237,7 @@ relax :: src/pddl+.o src/pddl+.o src/ptree.o src/RelaxTranslator.o src/Relax.o s
 
 # dynaplan
 
-dynaplan :: src/pddl+.o src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/dynaMain.o src/DebugWriteController.o src/typecheck.o src/TypedAnalyser.o src/FuncAnalysis.o src/TIM.o src/TimSupport.o src/graphconstruct.o src/SearchSpace.o src/PartialPlan.o src/Plan.o src/State.o src/Validator.o src/RepairAdvice.o src/LaTeXSupport.o src/Action.o src/Proposition.o src/FuncExp.o src/Ownership.o src/Environment.o src/Polynomial.o src/DebugWriteController.o src/Utils.o src/TrajectoryConstraints.o src/InstPropLinker.o src/Evaluator.o src/RobustAnalyse.o src/random.o src/Events.o src/PrettyPrinter.o
+dynaplan :: src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnvironment.o src/instantiation.o src/dynaMain.o src/DebugWriteController.o src/typecheck.o src/TypedAnalyser.o src/FuncAnalysis.o src/TIM.o src/TimSupport.o src/graphconstruct.o src/SearchSpace.o src/PartialPlan.o src/Plan.o src/State.o src/Validator.o src/RepairAdvice.o src/LaTeXSupport.o src/Action.o src/Proposition.o src/FuncExp.o src/Ownership.o src/Environment.o src/Polynomial.o src/DebugWriteController.o src/Utils.o src/TrajectoryConstraints.o src/InstPropLinker.o src/Evaluator.o src/RobustAnalyse.o src/random.o src/Events.o src/PrettyPrinter.o
   ifeq (${suffix dynaplan}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -251,7 +251,7 @@ dynaplan :: src/pddl+.o src/pddl+.o src/ptree.o src/SimpleEval.o src/FastEnviron
 
 # hww
 
-hww :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/HowWhatWhenMain.o src/HowAnalyser.o
+hww :: src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/HowWhatWhenMain.o src/HowAnalyser.o
   ifeq (${suffix hww}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -265,7 +265,7 @@ hww :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteCon
 
 # pinguplan
 
-pinguplan :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/PingusTranslator.o src/PinguPlanGenerator.o
+pinguplan :: src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWriteController.o src/typecheck.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/PingusTranslator.o src/PinguPlanGenerator.o
   ifeq (${suffix pinguplan}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -279,7 +279,7 @@ pinguplan :: src/pddl+.o src/pddl+.o src/ptree.o src/TypedAnalyser.o src/DebugWr
 
 # planrec
 
-planrec :: src/pddl+.o src/pddl+.o src/ptree.o src/Action.o src/Proposition.o src/FuncExp.o src/typecheck.o src/PlanRec.o src/Validator.o src/RepairAdvice.o src/LaTeXSupport.o src/State.o src/Plan.o src/Ownership.o src/Environment.o src/Polynomial.o src/DebugWriteController.o src/Utils.o src/TrajectoryConstraints.o src/RobustAnalyse.o src/random.o src/Events.o src/PrettyPrinter.o src/TypedAnalyser.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/SimpleEval.o src/instantiation.o src/CausalGraph.o src/ToFunction.o src/SASActions.o
+planrec :: src/pddl+.o src/ptree.o src/Action.o src/Proposition.o src/FuncExp.o src/typecheck.o src/PlanRec.o src/Validator.o src/RepairAdvice.o src/LaTeXSupport.o src/State.o src/Plan.o src/Ownership.o src/Environment.o src/Polynomial.o src/DebugWriteController.o src/Utils.o src/TrajectoryConstraints.o src/RobustAnalyse.o src/random.o src/Events.o src/PrettyPrinter.o src/TypedAnalyser.o src/TimSupport.o src/TIM.o src/FuncAnalysis.o src/SimpleEval.o src/instantiation.o src/CausalGraph.o src/ToFunction.o src/SASActions.o
   ifeq (${suffix planrec}, .a)
 	@${RM} $@
 	${AR} crs $@ ${filter-out %.a %.so, $^}
@@ -314,7 +314,7 @@ clean:: tidy
 
 # list of all source files
 
-MM_ALL_SOURCES := src/Action.cpp src/Analysis.cpp src/CausalGraph.cpp src/DYNA.cpp src/DYNATranslator.cpp src/DebugWriteController.cpp src/Environment.cpp src/Evaluator.cpp src/Events.cpp src/FastEnvironment.cpp src/FuncAnalysis.cpp src/FuncExp.cpp src/HowAnalyser.cpp src/HowWhatWhenMain.cpp src/InstPropLinker.cpp src/LPGP.cpp src/LPGPTranslator.cpp src/LaTeXSupport.cpp src/Ownership.cpp src/PartialPlan.cpp src/PinguPlanGenerator.cpp src/PingusTranslator.cpp src/Plan.cpp src/PlanRec.cpp src/Polynomial.cpp src/PrettyPrinter.cpp src/Proposition.cpp src/Relax.cpp src/RelaxTranslator.cpp src/RepairAdvice.cpp src/RobustAnalyse.cpp src/SASActions.cpp src/SearchSpace.cpp src/SimpleEval.cpp src/State.cpp src/TIM.cpp src/TIMMain.cpp src/TimSupport.cpp src/ToFnMain.cpp src/ToFunction.cpp src/TrajectoryConstraints.cpp src/TypeStrip.cpp src/TypeStripWC.cpp src/TypedAnalyser.cpp src/TypedAnalysis.cpp src/Utils.cpp src/Validator.cpp src/dynaMain.cpp src/graphconstruct.cpp src/instantiation.cpp src/instantiationMain.cpp src/main.cpp src/parse.cpp src/Parser/pddl+.lex src/ptree.cpp src/random.cpp src/typecheck.cpp
+MM_ALL_SOURCES := src/Action.cpp src/Analysis.cpp src/CausalGraph.cpp src/DYNA.cpp src/DYNATranslator.cpp src/DebugWriteController.cpp src/Environment.cpp src/Evaluator.cpp src/Events.cpp src/FastEnvironment.cpp src/FuncAnalysis.cpp src/FuncExp.cpp src/HowAnalyser.cpp src/HowWhatWhenMain.cpp src/InstPropLinker.cpp src/LPGP.cpp src/LPGPTranslator.cpp src/LaTeXSupport.cpp src/Ownership.cpp src/PartialPlan.cpp src/PinguPlanGenerator.cpp src/PingusTranslator.cpp src/Plan.cpp src/PlanRec.cpp src/Polynomial.cpp src/PrettyPrinter.cpp src/Proposition.cpp src/Relax.cpp src/RelaxTranslator.cpp src/RepairAdvice.cpp src/RobustAnalyse.cpp src/SASActions.cpp src/SearchSpace.cpp src/SimpleEval.cpp src/State.cpp src/TIM.cpp src/TIMMain.cpp src/TimSupport.cpp src/ToFnMain.cpp src/ToFunction.cpp src/TrajectoryConstraints.cpp src/TypeStrip.cpp src/TypeStripWC.cpp src/TypedAnalyser.cpp src/TypedAnalysis.cpp src/Utils.cpp src/Validator.cpp src/dynaMain.cpp src/graphconstruct.cpp src/instantiation.cpp src/instantiationMain.cpp src/main.cpp src/parse.cpp src/ptree.cpp src/random.cpp src/typecheck.cpp
 
 # target for checking a source file
 
@@ -452,7 +452,6 @@ jdepend:
 	@echo src/main.o >> ${JDEPEND_INPUT_FILE}
 	@echo src/parse.cpp >> ${JDEPEND_INPUT_FILE}
 	@echo src/parse.o >> ${JDEPEND_INPUT_FILE}
-	@echo src/Parser/pddl+.lex >> ${JDEPEND_INPUT_FILE}
 	@echo src/pddl+.o >> ${JDEPEND_INPUT_FILE}
 	@echo src/ptree.cpp >> ${JDEPEND_INPUT_FILE}
 	@echo src/ptree.o >> ${JDEPEND_INPUT_FILE}
@@ -462,40 +461,45 @@ jdepend:
 	@echo src/typecheck.o >> ${JDEPEND_INPUT_FILE}
 	@${MAKEMAKE} --depend Makefile -- ${DEPENDFLAGS} -- ${JDEPEND_INPUT_FILE}
 
+test: validate
+	issue-21/run.sh
+# issue-22/run.sh
+	issue-34/run.sh
 
 # DO NOT DELETE THIS LINE -- makemake depends on it.
 
-src/Analysis.o: 
+src/Analysis.o:
 
-src/DYNA.o: 
+src/DYNA.o:
 
-src/LPGP.o: 
+src/LPGP.o:
 
-src/PingusTranslator.o: 
+src/PingusTranslator.o:
 
-src/PlanRec.o: 
+src/PlanRec.o:
 
-src/Polynomial.o: 
+src/Polynomial.o:
 
-src/Relax.o: 
+src/Relax.o:
 
-src/TIM.o: 
+src/TIM.o:
 
 src/TimSupport.o:
 
-src/TypeStrip.o: 
+src/TypeStrip.o:
 
-src/TypedAnalysis.o: 
+src/TypedAnalysis.o:
 
-src/Validator.o: 
+src/Validator.o:
 
-src/dynaMain.o: 
+src/dynaMain.o:
 
-src/instantiation.o:  
+src/instantiation.o:
 
-src/instantiationMain.o: 
+src/instantiationMain.o:
 
-src/main.o: 
+src/main.o:
 
-src/parse.o: 
+src/parse.o:
 
+src/pddl+.o: src/pddl+.yacc src/pddl+.lcc

README.md

@@ -3,7 +3,7 @@ VAL
 
 This repository contains the current version of the VAL plan validation code. 
 
-Compilation under Linux using g++ should be straightforward: use "make validate", "make parser" etc. The repository also contains a ".cbp" file which is a CodeBlocks project file. Using this, the code is set up to offer the targets listed below for compilation using mingw under Windows. We have a version of the VAL code that compiles with Visual Studio, but have not completed the merging with this repository. Windows executables are in bin/validate, bin/parser etc.
+Compilation under Linux using g++ should be straightforward: use "make validate", "make parser" etc. The repository also contains a ".cbp" file which is a CodeBlocks project file. Using this, the code is set up to offer the targets listed below for compilation using mingw under Windows. We have a version of the VAL code that compiles with Visual Studio, but have not completed the merging with this repository. Windows executables are in bin/validate, bin/parser etc. Mac executables are in bin/MacOSExecutables/. 
 
 The main difficulties we have experienced in the past in compiling tend to be in the flex/bison code. To avoid that, the code in this repository contains pddl+.cpp, which is the generated source, and does not require to be regenerated from the lex and yacc source files in src/Parser.