[cig-commits] r8918 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2007-12-19 12:02:47 -0800 (Wed, 19 Dec 2007)
New Revision: 8918

Modified:
   cs/benchmark/cigma/trunk/src/Command.cpp
   cs/benchmark/cigma/trunk/src/Command.h
   cs/benchmark/cigma/trunk/src/CompareCmd.h
Log:
Remove Environment object


Modified: cs/benchmark/cigma/trunk/src/Command.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Command.cpp	2007-12-19 20:02:39 UTC (rev 8917)
+++ cs/benchmark/cigma/trunk/src/Command.cpp	2007-12-19 20:02:47 UTC (rev 8918)
@@ -2,17 +2,6 @@
 
 // ---------------------------------------------------------------------------
 
-cigma::Environment::Environment()
-{
-    configured = false;
-}
-
-cigma::Environment::~Environment()
-{
-}
-
-// ---------------------------------------------------------------------------
-
 cigma::Command::~Command()
 {
 }

Modified: cs/benchmark/cigma/trunk/src/Command.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Command.h	2007-12-19 20:02:39 UTC (rev 8917)
+++ cs/benchmark/cigma/trunk/src/Command.h	2007-12-19 20:02:47 UTC (rev 8918)
@@ -5,37 +5,32 @@
 
 namespace cigma
 {
-    class Environment;
     class Command;
 }
 
 
-
-/*
- * Base class for runtime enviroment
+/**
+ * @brief Base class for commands
+ *
  */
-class cigma::Environment
+class cigma::Command
 {
 public:
     typedef std::map<std::string, std::string> StringMap;
+    typedef std::vector<std::string> StringVector;
+
 public:
-    Environment();
-    virtual ~Environment();
-    virtual void configure(const StringMap &cmdline) = 0;
-public:
-    bool configured;
-};
+    virtual ~Command();
 
-
-/*
- * Base class for commands
- */
-class cigma::Command
-{
 public:
-    virtual void setEnvironment(Environment *env) = 0;
+    //virtual void parse(int argc, char *argv[], StringMap &params) = 0;
+    //virtual void configure(const StringMap &params) = 0;
+    virtual void configure(int argc, char *argv[]) = 0;
+    virtual void help() = 0;
     virtual void run() = 0;
-    virtual ~Command();
+
+public:
+    std::string name;
 };
 
 

Modified: cs/benchmark/cigma/trunk/src/CompareCmd.h
===================================================================
--- cs/benchmark/cigma/trunk/src/CompareCmd.h	2007-12-19 20:02:39 UTC (rev 8917)
+++ cs/benchmark/cigma/trunk/src/CompareCmd.h	2007-12-19 20:02:47 UTC (rev 8918)
@@ -5,65 +5,24 @@
 
 namespace cigma
 {
-    class CompareCmdEnv;
     class CompareCmd;
 }
 
-
 
 /*
- * Environment for CompareCmd
- */
-class cigma::CompareCmdEnv : public Environment
-{
-public:
-
-    CompareCmdEnv();
-    ~CompareCmdEnv();
-
-public:
-
-    void configure(const StringMap &cmdline);
-
-public:
-
-    std::string input_filename[2];
-    std::string output_filename;
-
-    std::string input_path[2];
-    std::string output_path;
-
-    std::string input_name[2];
-    std::string output_name;
-
-    std::string quadrature_rule;
-    std::string quadrature_order;
-
-};
-
-
-
-/*
  * Callback object for `cigma compare [args ...]'
  */
 class cigma::CompareCmd : public Command
 {
 public:
-
     CompareCmd();
     ~CompareCmd();
 
 public:
-
-    CompareCmdEnv *env;
-
-    void setEnvironment(Environment *env);
+    void configure(const StringMap &cmdlineParams);
     void run();
 
 public:
-    //enum types & other typedefs
-    
-public:
     // internal state
     //MeshPart *meshPart;
     //FEField *field_a;