| summaryrefslogtreecommitdiff |
path: root/sol-pretty-printer
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-08-04 12:47:30 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-08-04 12:47:30 +0200 |
| commit | d18ca72caf2004c7725b3de670c7397c5bf85eb4 (patch) | |
| tree | ce0d95cd60f2e9bac26015e645e4f33c165b8713 /sol-pretty-printer | |
| parent | c4914a0649090b4784b72909eab53ea01e20a93e (diff) | |
For some reason, CNE_01700 no longer works.improved_makefiles
Diffstat (limited to 'sol-pretty-printer')
| -rw-r--r-- | sol-pretty-printer/Makefile | 4 | ||||
| -rw-r--r-- | sol-pretty-printer/src/Solutions.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sol-pretty-printer/Makefile b/sol-pretty-printer/Makefile index 4c5d954..b983157 100644 --- a/sol-pretty-printer/Makefile +++ b/sol-pretty-printer/Makefile @@ -56,10 +56,10 @@ CLASSES = $(SOURCES:.java=.class) SOLUTION_FILES = $(wildcard $(SOL_DIR)/*.sol) PROPERTY_PP_FILES = $(PROPERTY_FILES:.pro=.pp) SOLUTION_PP_PAIRS = \ - $(foreach sf,$(SOLUTION_FILES),"$(sf) $(filter %$(basename $(notdir $(sf))).pp,$(PROPERTY_PP_FILES))") + $(foreach sf,$(SOLUTION_FILES),$(sf) $(filter %$(basename $(notdir $(sf))).pp,$(PROPERTY_PP_FILES))) run: $(SOLUTION_PP_PAIRS) $(MODEL_DIR)/structural.mod $(MODEL_DIR)/string_to_instr.map $(CLASSES) - $(JAVA) $(MODEL_DIR)/structural.mod $(MODEL_DIR)/string_to_instr.map $(SOLUTION_PP_PAIRS) + $(JAVA) -cp $(CLASSPATH) Main $(MODEL_DIR)/structural.mod $(MODEL_DIR)/string_to_instr.map $(SOLUTION_PP_PAIRS) %.class: %.java $(JAVAC) -cp $(CLASSPATH) $< diff --git a/sol-pretty-printer/src/Solutions.java b/sol-pretty-printer/src/Solutions.java index 38a426a..0129794 100644 --- a/sol-pretty-printer/src/Solutions.java +++ b/sol-pretty-printer/src/Solutions.java @@ -84,7 +84,8 @@ public class Solutions + me.getKey().toUpperCase() + "$" ), - Strings.get_string_from_id(me.getValue()) + /* FIXME */ + (Strings.get_string_from_id(me.getValue()) == null) ? "null" : Strings.get_string_from_id(me.getValue()) ); } } |