Changeset 171

Show
Ignore:
Timestamp:
03/21/09 17:06:44 (15 years ago)
Author:
bhilburn
Message:

Migrating back to using cstrings, which is definitely the better choice for us.

Location:
vtcross/trunk/src/include/vtcross
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • vtcross/trunk/src/include/vtcross/components.h

    r170 r171  
    205205         */ 
    206206        void GetSolution(Observable *observables); 
    207         void GetSolution(Observable *observables, std::string service); 
     207        void GetSolution(Observable *observables, char* service); 
    208208 
    209209 
     
    217217                Parameter *parameters, Utility *utilities); 
    218218        void ReceiveFeedback(Observable *observables, \ 
    219                 Parameter *parameters, std::string service); 
     219                Parameter *parameters, char* service); 
    220220}; 
    221221 
  • vtcross/trunk/src/include/vtcross/containers.h

    r170 r171  
    1414 
    1515#include <stdint.h> 
    16 #include <string> 
    17  
    18  
    19 /* TODO initially made all of the string fields std::strings, but this might not 
    20  * be the best end-decision. Need to evaluate our needs and figure out if 
    21  * cstrings would do better for us. */ 
    2216 
    2317 
     
    3933 */ 
    4034struct Utility { 
    41     std::string name; 
    42     std::string units; 
    43     std::string goal; 
     35    char* name; 
     36    char* units; 
     37    char* goal; 
    4438    float target; 
    4539    float value; 
     
    5246struct Affect { 
    5347    Utility *u; 
    54     std::string relation; 
     48    char* relation; 
    5549}; 
    5650 
     
    6054 */ 
    6155struct Parameter { 
    62     std::string name; 
    63     std::string units; 
     56    char* name; 
     57    char* units; 
    6458    float min; 
    6559    uint32_t numAffects; 
     
    7569 */ 
    7670struct Observable { 
    77     std::string name; 
     71    char* name; 
    7872    Affect affection_list[10]; 
    7973    uint32_t numAffects;