Changeset 75

Timestamp:

11/23/08 15:36:07 (16 years ago)

Author:

ahe

Message:

remove test printout

Files:

• vtcross/branches/trnewman/CR_shell/src/main_cognitive_engine.cpp (modified) (9 diffs)

vtcross/branches/trnewman/CR_shell/src/main_cognitive_engine.cpp

@@ -80 +80 @@
     ReadMessage(sockfd,buffer);
     ce_info->numUtilities = atoi(buffer);
-    printf("number of utilities: %d\n", ce_info->numUtilities);
+    //printf("number of utilities: %d\n", ce_info->numUtilities);
         
     for (i = 0; i < ce_info->numUtilities; i++){
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-            printf("Name: %s\n", buffer);
+            //printf("Name: %s\n", buffer);
         strcpy(uList[i].name, buffer);
                  
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-            printf("Units: %s\n", buffer);
+            //printf("Units: %s\n", buffer);
         strcpy(uList[i].units, buffer);
 
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-        printf("Goal: %s\n", buffer);
+        //printf("Goal: %s\n", buffer);
         strcpy(uList[i].goal, buffer);
         
             bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-        printf("Target: %s\n", buffer);
+        //printf("Target: %s\n", buffer);
         uList[i].target = atof(buffer);
     }
@@ -116 +116 @@
     ReadMessage(sockfd,buffer);
     ce_info->numParameters = atoi(buffer);
-    printf("number of parameters: %d\n", ce_info->numParameters);
+    //printf("number of parameters: %d\n", ce_info->numParameters);
         
     for (i = 0; i < ce_info->numParameters; i++){
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-            printf("Name: %s\n", buffer);
+            //printf("Name: %s\n", buffer);
         strcpy(pList[i].name, buffer);
                  
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-            printf("Units: %s\n", buffer);
+            //printf("Units: %s\n", buffer);
         strcpy(pList[i].units, buffer);
 
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-        printf("Min: %s\n", buffer);
+        //printf("Min: %s\n", buffer);
         pList[i].min = atof(buffer);
         
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-        printf("Max: %s\n", buffer);
+        //printf("Max: %s\n", buffer);
         pList[i].max = atof(buffer);
         
             bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-        printf("Step: %s\n", buffer);
+        //printf("Step: %s\n", buffer);
         pList[i].step = atof(buffer);
     
@@ -148 +148 @@
         ReadMessage(sockfd,buffer);
         pList[i].numAffects = atoi(buffer);
-        printf("number of affects: %d\n", pList[i].numAffects);
+        //printf("number of affects: %d\n", pList[i].numAffects);
         
         for (j = 0; j < pList[i].numAffects; j++){
             bzero(buffer,256);
                 ReadMessage(sockfd,buffer);
-                printf("Utility name: %s\n", buffer);
+                //printf("Utility name: %s\n", buffer);
             strcpy(pList[i].affection_list[j].u.name, buffer);
                  
             bzero(buffer,256);
                 ReadMessage(sockfd,buffer);
-                printf("Relation: %s\n", buffer);
+                //printf("Relation: %s\n", buffer);
             strcpy(pList[i].affection_list[j].relation, buffer);
         }
@@ -175 +175 @@
     ReadMessage(sockfd,buffer);
     ce_info->numObservables = atoi(buffer);
-    printf("number of observables: %d\n", ce_info->numObservables);
+    //printf("number of observables: %d\n", ce_info->numObservables);
         
     for (i = 0; i < ce_info->numObservables; i++){
         bzero(buffer,256);
             ReadMessage(sockfd,buffer);
-            printf("Name: %s\n", buffer);
+            //printf("Name: %s\n", buffer);
         strcpy(oList[i].name, buffer);
                  
@@ -187 +187 @@
         ReadMessage(sockfd,buffer);
         oList[i].numAffects = atoi(buffer);
-        printf("number of affects: %d\n", oList[i].numAffects);
+        //printf("number of affects: %d\n", oList[i].numAffects);
         
         for (j = 0; j < oList[i].numAffects; j++){
             bzero(buffer,256);
                 ReadMessage(sockfd,buffer);
-                printf("Utility name: %s\n", buffer);
+                //printf("Utility name: %s\n", buffer);
             strcpy(oList[i].affection_list[j].u.name, buffer);
                  
             bzero(buffer,256);
                 ReadMessage(sockfd,buffer);
-                printf("Relation: %s\n", buffer);
+                //printf("Relation: %s\n", buffer);
             strcpy(oList[i].affection_list[j].relation, buffer);
         }
@@ -222 +222 @@
 }
 
-void print_current_config(Utility * uList[], Parameter * pList[], 
-        Observable * oList[], CE_Info * ce_info) 
+void print_current_config(Utility uList[], Parameter pList[], 
+        Observable oList[], CE_Info * ce_info) 
 {    
     int i = 0;
@@ -230 +230 @@
     // utilities
     for(i = 0; i < ce_info->numUtilities ; i++) {
-        cout << "Utility:  " << uList[i]->name << endl;
-        cout << "     Units:  " << uList[i]->units << endl;
-        cout << "     Goal:   " << uList[i]->goal << endl;
-        cout << "     Target: " << uList[i]->target << endl;
+        cout << "Utility:  " << uList[i].name << endl;
+        cout << "     Units:  " << uList[i].units << endl;
+        cout << "     Goal:   " << uList[i].goal << endl;
+        cout << "     Target: " << uList[i].target << endl;
     }
                        
     // parameters                        
     for(i = 0; i < ce_info->numParameters; i++) {
-        cout << "Parameter:  " << pList[i]->name << endl;
-        cout << "       Units:   " << pList[i]->units << endl;
-        cout << "       Min:     " << pList[i]->min << endl;
-        cout << "       Max:     " << pList[i]->max << endl;
-        cout << "       Step:    " << pList[i]->step << endl;
-        for(j = 0; j < pList[i]->numAffects; j++) {
-            cout << "       Affect: " << pList[i]->affection_list[j].u.name << " -> " << pList[i]->affection_list[j].relation << endl;
+        cout << "Parameter:  " << pList[i].name << endl;
+        cout << "       Units:   " << pList[i].units << endl;
+        cout << "       Min:     " << pList[i].min << endl;
+        cout << "       Max:     " << pList[i].max << endl;
+        cout << "       Step:    " << pList[i].step << endl;
+        for(j = 0; j < pList[i].numAffects; j++) {
+            cout << "       Affect: " << pList[i].affection_list[j].u.name << " -> " << pList[i].affection_list[j].relation << endl;
         }
     }
@@ -250 +250 @@
     // observables
     for(i = 0; i < ce_info->numObservables; i++) {
-        cout << "Observable:  " << oList[i]->name << endl;
-        for(j = 0; j < oList[i]->numAffects; j++) {
-            cout << "       Affect: " << oList[i]->affection_list[j].u.name << " -> " << oList[i]->affection_list[j].relation << endl;
+        cout << "Observable:  " << oList[i].name << endl;
+        for(j = 0; j < oList[i].numAffects; j++) {
+            cout << "       Affect: " << oList[i].affection_list[j].u.name << " -> " << oList[i].affection_list[j].relation << endl;
         }
     }
@@ -301 +301 @@
     GetXMLFromServer(sockfd, uList, pList, oList, &ce_info);
 
-    printf("utility:\n name: %s, units: %s, goal: %s, target: %f\n", 
-            uList[0].name, uList[0].units, uList[0].goal, uList[0].target);
-    
-    //print_current_config(&uList, &pList, &oList, &ce_info); 
+    //printf("utility:\n name: %s, units: %s, goal: %s, target: %f\n", 
+    //        uList[0].name, uList[0].units, uList[0].goal, uList[0].target);
+    
+    print_current_config(uList, pList, oList, &ce_info);