Changeset 224

Timestamp:

03/31/09 11:17:58 (15 years ago)

Author:

bhilburn

Message:

Fixed memory leak, variable scoping, style issues.

Files:

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

vtcross/trunk/src/cognitive_engines/CognitiveEngine.cpp

@@ -88 +88 @@
 {
     char buffer[256];
-    uint16_t i;
 
     while(true) {
@@ -111 +110 @@
             uint32_t numObservables = atoi(buffer);
    
-            Observable * o = new Observable[numObservables];
+            Observable *o = new Observable[numObservables];
  
-            for (i = 0; i < numObservables; i++){
+            for(size_t i = 0; i < numObservables; i++) {
                 memset(buffer, 0, 256);
-                ReadMessage(commandSocketFD,buffer);
+                ReadMessage(commandSocketFD, buffer);
                 o[i].name = std::string(buffer);
     
                 memset(buffer, 0, 256);
-                ReadMessage(commandSocketFD,buffer);
+                ReadMessage(commandSocketFD, buffer);
                 o[i].value = atof(buffer);
             }  
 
                         LOG("Cognitive Engine:: Processing parameters....\n");
+
+            // TODO need to actually do something with the observables here
+            
                         LOG("Cognitive Engine:: Sending Optimal Parameters to Application.\n");
+
             SendMessage(commandSocketFD,"1");
             SendMessage(commandSocketFD,"txPower");
             SendMessage(commandSocketFD,"10");
+
+            delete [] o;
         }
         else if(strcmp(buffer, "query_component_type") == 0) {
@@ -280 +285 @@
     
     char buffer[256];
-    uint32_t i,j,k;   
  
     /* Receive Set of Utilities */
@@ -287 +291 @@
     radioInfo->numUtilities = atoi(buffer);
     
-    for (i = 0; i < radioInfo->numUtilities; i++){
+    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
         memset(buffer, 0, 256);
         ReadMessage(commandSocketFD,buffer);
@@ -335 +339 @@
         pList[i].numAffects = atoi(buffer);
     
-        for (j = 0; j < pList[i].numAffects; j++){
+        for(size_t j = 0; j < pList[i].numAffects; j++) {
             memset(buffer, 0, 256);
             ReadMessage(commandSocketFD,buffer);
-            for (k = 0; k < radioInfo->numUtilities; k++){
+            for(size_t k = 0; k < radioInfo->numUtilities; k++) {
                 if(uList[k].name == std::string(buffer)){    
                     pList[i].affection_list[j].u = &uList[k];   
@@ -356 +360 @@
     radioInfo->numObservables = atoi(buffer);
     
-    for (i = 0; i < radioInfo->numObservables; i++){
+    for(size_t i = 0; i < radioInfo->numObservables; i++) {
         memset(buffer, 0, 256);
         ReadMessage(commandSocketFD,buffer);
@@ -365 +369 @@
         oList[i].numAffects = atoi(buffer);
     
-        for (j = 0; j < oList[i].numAffects; j++){
+        for(size_t j = 0; j < oList[i].numAffects; j++) {
             memset(buffer, 0, 256);
             ReadMessage(commandSocketFD,buffer);
-            for (k = 0; k < radioInfo->numUtilities; k++){
+            for(size_t k = 0; k < radioInfo->numUtilities; k++) {
                 if(uList[k].name == std::string(buffer)){    
                     oList[i].affection_list[j].u = &uList[k];