Changeset 89 for vtcross

Timestamp:

11/27/08 21:32:50 (16 years ago)

Author:

ahe

Message:

fixed the bug, experience transmission works

Location:

vtcross/branches/trnewman/CR_engines/CBR/src

Files:

• cbr.c (modified) (1 diff)
• main_cognitive_engine.c (modified) (8 diffs)

vtcross/branches/trnewman/CR_engines/CBR/src/cbr.c

@@ -85 +85 @@
         } else {
             printf("no matched rearch results. use default values\n");
-            // set default values
+            
             _retvals[0] = 100;  // throughput
             _retvals[1] = 1;    // spectral_efficiency

vtcross/branches/trnewman/CR_engines/CBR/src/main_cognitive_engine.c

@@ -303 +303 @@
     ReadMessage(sockfd,buffer);
     *num_cols = atoi(buffer);
-    /*printf("number of rows: %d, number of columns: %d\n", 
-            *num_rows, *num_cols); */
     return 1;
 }
@@ -310 +308 @@
 
 int GetExperience(int sockfd, int num_rows, int num_cols, 
-        float **past_exp)
+        //float **past_exp)
+        float past_exp[num_rows][num_cols])
 {
     char buffer[256];
@@ -380 +379 @@
 int RunCBREngine(struct Utility uList[], struct Parameter pList[],
         struct Observable oList[], struct CE_Info *ce_info, 
-        int num_cols, int num_rows, float ** past_exp)
+        //int num_cols, int num_rows, float ** past_exp)
+        int num_cols, int num_rows, float past_exp[num_rows][num_cols])
 {
     
@@ -386 +386 @@
 
     // get column names
-    //char *cols[50];
+    /*char *cols[50] = {"throughput", "spectral_efficiency", 
+    "log10_ber", "mod_scheme", "tx_power", "SNR", "utility"};*/
     //char cols[num_cols][50];
+    
     char **cols;
     cols = (char **)malloc(sizeof(char)*num_cols);
@@ -409 +411 @@
         j++;
     }
-    printf("number of columns: %d, %d\n", num_cols, j);
     cols[j] = malloc(strlen("utility")+1);
     cols[j] = "utility";
-    //strcpy(cols[j], "utility");
-    printf("here\n");
-    
-    printf("number of columns: %d\n", num_cols);
+    
     printf("column names:");
     for (i = 0; i<num_cols; i++){
@@ -429 +427 @@
     cbr mycbr = cbr_create(filename, tablename, cols, num_cols);
     //cbr mycbr = cbr_create("ex1", "data", cols, num_cols);
-    
+
     // add row here
     float vals[num_cols];
@@ -440 +438 @@
     vals[5] = 10.0f;   // SNR
     vals[6] = 0.762;    // utility*/
-    printf("here\n");
     for (i = 0; i < num_rows; i++){
         for (j = 0; j < num_cols; j++){
             vals[j] = past_exp[i][j];
         }
-        printf("add row to cbr table\n");
         rc = cbr_add_row(mycbr, cols, vals, num_cols);
     }
@@ -542 +538 @@
     print_current_config(uList, pList, oList, &ce_info); 
 
-    // get experience size rom server
+    // get experience size from server
     int num_rows, num_cols;
     GetExperienceSize(sockfd, &num_rows, &num_cols);
-    //printf("number of rows: %d, number of columns: %d\n", 
-    //        num_rows, num_cols); 
     // get experience
-    float **past_exp;
     int i, j;
+    /*float **past_exp;
     past_exp = (float **)malloc(sizeof(float)*num_rows);
     for (i = 0; i< 1; i++){
         past_exp[i] = (float*)malloc(sizeof(float)*num_cols);
-    }
+    }*/
+    float past_exp[num_rows][num_cols];
     GetExperience(sockfd, num_rows, num_cols, past_exp);
     for (i = 0; i < num_rows; i++){
+        printf("experience #%d:\n", i+1);
         for (j = 0; j < num_cols; j++){
-        printf("experience: %f\n", past_exp[i][j]);
-        }
+        printf(" %f", past_exp[i][j]);
+        }
+        printf("\n");
     }