Changeset 473

Timestamp:

09/09/09 14:01:12 (15 years ago)

Author:

bhilburn

Message:

The CBR_CE is now properly using strings.

Files:

• vtcross/trunk/src/cognitive_engines/CBR_CE/CognitiveEngine.cpp (modified) (8 diffs)

vtcross/trunk/src/cognitive_engines/CBR_CE/CognitiveEngine.cpp

@@ -19 +19 @@
 #include <stdint.h>
 #include <cmath>
+#include <string>
 
 #include "vtcross/cbr.h"
@@ -28 +29 @@
 #include "vtcross/socketcomm.h"
 
+using namespace std;
+
 static CBR *myCBR;
 
@@ -85 +88 @@
         ReceiveRadioConfiguration();
         ReceiveExperience();
-        
         RegisterServices();
     }
@@ -109 +111 @@
     float valList[numberColumns];
     float obsVals[numberColumns];
-    char *nameList[numberColumns];
-    char *obsList[obsColumns];
+    string nameList[numberColumns];
+    string obsList[obsColumns];
 
     size_t columnObsIndex = 0;
     for (size_t i = 0; i < radioInfo->numObservables; i++){
-        obsList[columnObsIndex] = (char*)observables[i].name.c_str();
+        obsList[columnObsIndex] = observables[i].name;
         columnObsIndex++;
     }  
-    obsList[columnObsIndex] = (char *) "utility";
+    obsList[columnObsIndex] = "utility";
 
     size_t columnIndex = 0;
     for (size_t i = 0; i < radioInfo->numParameters; i++){
-        nameList[columnIndex] = (char*)parameters[i].name.c_str();
+        nameList[columnIndex] = (char*)parameters[i].name;
         columnIndex++;
     }   
     for (size_t i = 0; i < radioInfo->numUtilities; i++){
-        nameList[columnIndex] = (char*)uList[i].name.c_str();
+        nameList[columnIndex] = (char*)uList[i].name;
         columnIndex++;
     }   
@@ -636 +638 @@
     LOG("Cognitive Engine:: Generating solution.\n");
 
-    char *searchNames[radioInfo->numUtilities];
+    string searchNames[radioInfo->numUtilities];
 
     for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        searchNames[i] = (char*)observables[i].name.c_str();
+        searchNames[i] = (char*)observables[i].name;
     }
 
@@ -648 +650 @@
     }
 
-    uint32_t numberColumns = 
-        radioInfo->numUtilities +
-        radioInfo->numParameters +
-        radioInfo->numObservables + 1;
+    uint32_t numberColumns = radioInfo->numUtilities + radioInfo->numParameters \
+                             + radioInfo->numObservables + 1;
     
     float returnValues[numberColumns];
@@ -723 +723 @@
     returnValues[returnValueIndex] = 0;
 
-    char *allNames[numberColumns];
+    string allNames[numberColumns];
     size_t allNameIndex = 0;
     for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        allNames[allNameIndex] = (char*)uList[i].name.c_str();
+        allNames[allNameIndex] = (char*)uList[i].name;
         returnValues[allNameIndex] = uList[i].target;
         allNameIndex++;
     }
     for(size_t i = 0; i < radioInfo->numParameters; i++) {
-        allNames[allNameIndex] = (char*)pList[i].name.c_str();
+        allNames[allNameIndex] = (char*)pList[i].name;
         allNameIndex++;
     }
     for(size_t i = 0; i < radioInfo->numObservables; i++) {
-        allNames[allNameIndex] = (char*)oList[i].name.c_str();
+        allNames[allNameIndex] = (char*)oList[i].name;
         returnValues[allNameIndex] = 0;
         allNameIndex++;
     }
-    allNames[allNameIndex] = (char *)"utility";
+    allNames[allNameIndex] = "utility";
 
     // Add row to CBR. 
-    myCBR->AddRow(allNames, returnValues, returnValueIndex+1);
+    myCBR->AddRow(allNames, returnValues, returnValueIndex + 1);
 
     return pList;
@@ -769 +769 @@
 CognitiveEngine::BuildCognitiveEngine()
 {
-    char filename[] = {"ex1"};
-    char tablename[] = {"data"};
-
-    uint32_t numberColumns = 
-        radioInfo->numUtilities +
-        radioInfo->numParameters +
-        radioInfo->numObservables + 1;
-
-    char *cols[numberColumns];
+    string filename = "ex1";
+    string tablename = "data";
+
+    uint32_t numberColumns = radioInfo->numUtilities + radioInfo->numParameters \
+                             + radioInfo->numObservables + 1;
+
+    string cols[numberColumns];
 
     size_t columnIndex = 0;
     for (size_t i = 0; i < radioInfo->numUtilities; i++){
-        cols[columnIndex] = (char*)uList[i].name.c_str();
+        cols[columnIndex] = (char*)uList[i].name;
         columnIndex++;
     }   
     for (size_t i = 0; i < radioInfo->numParameters; i++){
-        cols[columnIndex] = (char*)pList[i].name.c_str();
+        cols[columnIndex] = (char*)pList[i].name;
         columnIndex++;
     }   
     for (size_t i = 0; i < radioInfo->numObservables; i++){
-        cols[columnIndex] = (char*)oList[i].name.c_str();
+        cols[columnIndex] = (char*)oList[i].name;
         columnIndex++;
     }   
-    cols[columnIndex] = (char *) "utility";
+    cols[columnIndex] = "utility";
 
     myCBR = new CBR(filename, tablename, cols, numberColumns);