Changeset 131

Show
Ignore:
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.

Location:
vtcross/branches/bhilburn
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • vtcross/branches/bhilburn/.gitignore

    r130 r131  
    3333policy_demo 
    3434cbr_demo 
     35shell_demo 

  • vtcross/branches/bhilburn/src/Makefile.am

    r123 r131  
    11SUBDIRS = policy_engines cognitive_engines service_management_layer libvtcross \ 
    2                   shell tinyxml include 
     2                  tinyxml shell include 

  • vtcross/branches/bhilburn/src/shell/Makefile.am

    r120 r131  
     1INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/tinyxml 
     2 
    13bin_PROGRAMS = shell_demo 
    24 
    35shell_demo_SOURCES = cr_shell.cpp 
     6shell_demo_LDADD = ../tinyxml/libtinyxml.a 
     7shell_demo_LDFLAGS = -pthread 
    48 

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

    r112 r131  
    55#include <netinet/in.h> 
    66#include <netdb.h> 
    7 #include "tinyxml.h" 
    8 #include "tinystr.h" 
    97#include <arpa/inet.h> 
    108#include <sys/mman.h> 
    … …  
    1513//#include "socket/SocketException.h" 
    1614 
     15#include "vtcross/containers.h" 
     16#include "tinyxml.h" 
     17#include "tinystr.h" 
     18 
    1719using namespace std; 
    1820 
    1921#define CE_SERVER_PORT 30001 
    2022#define POLICY_SERVER_PORT 30003 
    21  
    22 struct CE_Info { 
    23         int numUtilities; 
    24         int numParameters; 
    25         int numObservables; 
    26     int policy_engine; 
    27     int policy_socket; 
    28     int ce_socket; 
    29 }; 
    30  
    31 struct Utility { 
    32         string name; 
    33         string units; 
    34         string goal; 
    35         float target; 
    36     float value; 
    37 }; 
    38 struct Affect { 
    39         Utility * u; 
    40         string relation; 
    41 }; 
    42 struct Parameter { 
    43         string name; 
    44         string units; 
    45         float min; 
    46         int numAffects; 
    47         Affect affection_list[10]; 
    48         float max; 
    49         float step; 
    50     float value; 
    51 }; 
    52  
    53 struct Observable { 
    54         string name; 
    55         Affect affection_list[10]; 
    56         int numAffects; 
    57     float value; 
    58 }; 
    5923 
    6024void DieWithError(char *errorMessage) 

  • vtcross/branches/bhilburn/src/tinyxml/Makefile.am

    r120 r131  
     1noinst_LIBRARIES = libtinyxml.a 
     2libtinyxml_a_SOURCES = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp