Changeset 457 for vtcross/trunk/src/cognitive_engines/OSSIE_DEMO_CE/cbr.c

Timestamp:

09/02/09 18:33:48 (15 years ago)

Author:

cdietric

Message:

updates for CROSS-OSSIE demo

Files:

• vtcross/trunk/src/cognitive_engines/OSSIE_DEMO_CE/cbr.c (modified) (9 diffs)

vtcross/trunk/src/cognitive_engines/OSSIE_DEMO_CE/cbr.c

@@ -57 +57 @@
     char *zErrMsg = 0;
 
-    //printf("command: %s\n", _cbr->command);
+    printf("command: %s\n", _cbr->command);
     rc = sqlite3_exec(_cbr->db, _cbr->command, callback, 0, &zErrMsg);
     if( rc!=SQLITE_OK){
@@ -63 +63 @@
         sqlite3_free(zErrMsg);
     } else{
-        //printf("command executed.\n");
+        printf("command executed.\n");
     }
     return rc;
@@ -129 +129 @@
             strcat(_cbr->command, ", ");
     }
-    strcat(_cbr->command, ", timestamp DATE);");
+    strcat(_cbr->command, ", timestamp DATE, PRIMARY KEY(biterrorrate,tx_power));");
 
     // execute create table command
@@ -202 +202 @@
     unsigned int i;
     char str_buffer[64];
-    printf("number of ops %d:\n", _n);
+    //printf("number of ops %d:\n", _n);
     for (i=0; i<_n; i++) {
         // ensure valid ops value
@@ -212 +212 @@
         strcat(_cbr->command, _names[i]);
         strcat(_cbr->command, ops_str[_ops[i]]);
-    printf("search command: %s\n", _cbr->command);
         sprintf(str_buffer, "%E", _vals[i]);
         strcat(_cbr->command, str_buffer);
@@ -220 +219 @@
             strcat(_cbr->command, " AND ");
         else
-            strcat(_cbr->command, " order by utility, timestamp desc );");
-    }
-
-    //printf("search command: %s\n", _cbr->command);
+            strcat(_cbr->command, " order by abs(utility) asc, timestamp desc;");
+    }
+
+    printf("search command: %s\n", _cbr->command);
 
     //ExecuteCommand(_cbr);
     rc = ExecuteSearchCommand(_cbr, _retvals);
     
-    /*printf("search result: ");
-    for (i=0; i<_cbr->num_columns; i++)
+    printf("search result: ");
+    for (i=0; i<_cbr->num_columns +1; i++)
         printf("%f, ",_retvals[i]);
-    printf("\n");*/
+    printf("\n");
 
     return rc;
@@ -258 +257 @@
     }
    
-    strcat(_cbr->command, "timestamp = DATETIME('NOW')");
+    strcat(_cbr->command, ", timestamp = DATETIME('NOW')");
     
     strcat(_cbr->command, " WHERE ");
@@ -272 +271 @@
     strcat(_cbr->command, ";");
     
-    //printf("search command: %s\n", _cbr->command);
+    //printf("update command: %s\n", _cbr->command);
     // execute add command
     ExecuteCommand(_cbr);
@@ -286 +285 @@
     // generate command
     //printf("%s\n", _cbr->command);
-    strcpy(_cbr->command, "insert into ");
+    strcpy(_cbr->command, "replace into ");
     strcat(_cbr->command, _cbr->tablename);