Changeset 131 for vtcross/branches/bhilburn/src/shell/cr_shell.cpp

Timestamp:

03/10/09 16:06:37 (15 years ago)

Author:

bhilburn

Message:

The VTCROSS now successfully builds and links. Building tinyml and creating a
static library from it for linking within vtcross.

Files:

• vtcross/branches/bhilburn/src/shell/cr_shell.cpp (modified) (2 diffs)

vtcross/branches/bhilburn/src/shell/cr_shell.cpp

@@ -5 +5 @@
 #include <netinet/in.h>
 #include <netdb.h>
-#include "tinyxml.h"
-#include "tinystr.h"
 #include <arpa/inet.h>
 #include <sys/mman.h>
@@ -15 +13 @@
 //#include "socket/SocketException.h"
 
+#include "vtcross/containers.h"
+#include "tinyxml.h"
+#include "tinystr.h"
+
 using namespace std;
 
 #define CE_SERVER_PORT 30001
 #define POLICY_SERVER_PORT 30003
-
-struct CE_Info {
-        int numUtilities;
-        int numParameters;
-        int numObservables;
-    int policy_engine;
-    int policy_socket;
-    int ce_socket;
-};
-
-struct Utility {
-        string name;
-        string units;
-        string goal;
-        float target;
-    float value;
-};
-struct Affect {
-        Utility * u;
-        string relation;
-};
-struct Parameter {
-        string name;
-        string units;
-        float min;
-        int numAffects;
-        Affect affection_list[10];
-        float max;
-        float step;
-    float value;
-};
-
-struct Observable {
-        string name;
-        Affect affection_list[10];
-        int numAffects;
-    float value;
-};
 
 void DieWithError(char *errorMessage)