Changeset 173 for vtcross/trunk/src/include
- Timestamp:
- 03/21/09 17:06:46 (15 years ago)
- Location:
- vtcross/trunk/src/include/vtcross
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
vtcross/trunk/src/include/vtcross/components.h
r171 r173 20 20 21 21 #include <stdint.h> 22 #include <string> 22 23 23 24 #include "containers.h" … … 205 206 */ 206 207 void GetSolution(Observable *observables); 207 void GetSolution(Observable *observables, char*service);208 void GetSolution(Observable *observables, std::string service); 208 209 209 210 … … 217 218 Parameter *parameters, Utility *utilities); 218 219 void ReceiveFeedback(Observable *observables, \ 219 Parameter *parameters, char*service);220 Parameter *parameters, std::string service); 220 221 }; 221 222 -
vtcross/trunk/src/include/vtcross/containers.h
r171 r173 14 14 15 15 #include <stdint.h> 16 #include <string> 16 17 17 18 … … 33 34 */ 34 35 struct Utility { 35 char*name;36 char*units;37 char*goal;36 std::string name; 37 std::string units; 38 std::string goal; 38 39 float target; 39 40 float value; … … 46 47 struct Affect { 47 48 Utility *u; 48 char*relation;49 std::string relation; 49 50 }; 50 51 … … 54 55 */ 55 56 struct Parameter { 56 char*name;57 char*units;57 std::string name; 58 std::string units; 58 59 float min; 59 60 uint32_t numAffects; … … 69 70 */ 70 71 struct Observable { 71 char*name;72 std::string name; 72 73 Affect affection_list[10]; 73 74 uint32_t numAffects;