Finishes the sol_pretty_printer, 'xcept Makefile.

1 files changed, 17 insertions, 3 deletions

diff --git a/sol_pretty_printer/src/Parameters.java b/sol_pretty_printer/src/Parameters.java
index 6d64e27..92e9074 100644
--- a/sol_pretty_printer/src/Parameters.java
+++ b/sol_pretty_printer/src/Parameters.java
@@ -6,6 +6,7 @@ public class Parameters
    private final List<String> sol_files;
    private final List<String> pp_files;
    private final List<String> model_files;
+   private final List<String> map_files;
 
    private final boolean are_valid;
 
@@ -15,14 +16,15 @@ public class Parameters
       (
          "Sol-Pretty-Printer\n"
          + "USAGE:\n"
-         + "\tjava Main <MODEL_FILE>+ <SOL_AND_PP_FILES>+\n"
+         + "\tjava Main <MODEL_FILE|MAP_FILE>+ <SOL_AND_PP_FILES>+\n"
          + "PARAMETERS:\n"
-         + "\t- <MODEL_FILE>\tInstr. model files.\n"
+         + "\t- <MODEL_FILE|MAP_FILE>\tInstr. model files, string map files.\n"
          + "\t- <SOL_AND_PP_FILES>\tOne solution file, followed by one pretty"
          + " print file."
          + "NOTES:\n"
          + "\t- Model files have a \".mod\" extension.\n"
          + "\t- Solution files have a \".sol\" extension.\n"
+         + "\t- Map files have a \".map\" extension.\n"
          + "\t- Pretty-print files have a \".pp\" extension.\n"
          + "\t- Solution files may contain any number of solutions.\n"
       );
@@ -32,6 +34,7 @@ public class Parameters
    {
       boolean has_error, prev_was_a_sol;
 
+      map_files = new ArrayList<String>();
       model_files = new ArrayList<String>();
       sol_files = new ArrayList<String>();
       pp_files = new ArrayList<String>();
@@ -48,12 +51,16 @@ public class Parameters
       has_error = false;
       prev_was_a_sol = false;
 
-      for (int i = 1; i < args.length; ++i)
+      for (int i = 0; i < args.length; ++i)
       {
          if (args[i].endsWith(".mod"))
          {
             model_files.add(args[i]);
          }
+         else if (args[i].endsWith(".map"))
+         {
+            map_files.add(args[i]);
+         }
          else if (args[i].endsWith(".sol"))
          {
             sol_files.add(args[i]);
@@ -85,6 +92,8 @@ public class Parameters
                System.exit(-1);
             }
 
+            pp_files.add(args[i]);
+
             prev_was_a_sol = false;
          }
          else
@@ -103,6 +112,11 @@ public class Parameters
       are_valid = !has_error;
    }
 
+   public List<String> get_map_files ()
+   {
+      return map_files;
+   }
+
    public List<String> get_model_files ()
    {
       return model_files;