Changeset 457

Timestamp:

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

Author:

cdietric

Message:

updates for CROSS-OSSIE demo

Location:

vtcross/trunk

Files:

• configure.ac (modified) (1 diff)
• src/cognitive_engines/OSSIE_DEMO_CE/OSSIE_CE.cpp (modified) (4 diffs)
• src/cognitive_engines/OSSIE_DEMO_CE/cbr.c (modified) (9 diffs)
• src/shell/configs/ossie_demo.xml (modified) (3 diffs)

vtcross/trunk/configure.ac

@@ -27 +27 @@
 
 AC_DISABLE_STATIC
-AM_PATH_PYTHON(2.6)
+AM_PATH_PYTHON(2.5)
 SWIG_ENABLE_CXX
 SWIG_PYTHON

vtcross/trunk/src/cognitive_engines/OSSIE_DEMO_CE/OSSIE_CE.cpp

@@ -29 +29 @@
 
 #define TXPOWER 1
+#define DECREMENTSCALE 5
+#define INCREMENTSCALE 5
 
 static cbr myCBR;
@@ -675 +677 @@
     }
 
+    cbr_print(myCBR);
+
     /* CBR specific call */
     uint32_t rc = cbr_search(myCBR, searchNames, searchOps, searchVals,
@@ -684 +688 @@
 
         /* Should do a random adaptation.. */
-        if(returnValues[numberColumns-1] < 0) {
-            returnValues[2] = returnValues[2] - 15;
-        } else {
-            returnValues[2] = returnValues[2] + 15;
+        if(returnValues[numberColumns-1] > (uList[0].target * 0.2)) {
+            returnValues[1] = returnValues[1] - DECREMENTSCALE*returnValues[numberColumns-1];
+        } else if(returnValues[numberColumns-1] < -(uList[0].target * 0.2)) {
+            returnValues[1] = returnValues[1] + INCREMENTSCALE*returnValues[numberColumns-1];
         }
     } else if(rc == 31337) {
@@ -693 +697 @@
         /* No rows in the CBR, pick default parameters */
         /* Currently this is hard coded and implementation specific! */
-        returnValues[2] = currentParameters[0].value + 5;
+        returnValues[1] = currentParameters[0].value + .25;
         
     } else {

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);
     

vtcross/trunk/src/shell/configs/ossie_demo.xml

@@ -8 +8 @@
     <!-- utilities : QoS metrics -->
     <utilities>
-        <utility name="bit-error-rate" units="" goal="min" target=".005" /> 
+        <utility name="biterrorrate" units="" goal="min" target=".025" /> 
     </utilities>
 
@@ -14 +14 @@
     <parameters>
         <parameter name="tx_power" units="dBm" min="1" max="255" step="1">
-            <affect utility="bit-error-rate" relationship="improve"/>
+            <affect utility="biterrorrate" relationship="improve"/>
         </parameter>
     </parameters>
@@ -21 +21 @@
     <observables>
         <observable name="ber">
-            <affect utility="bit-error-rate" relationship="improve" />
+            <affect utility="biterrorrate" relationship="improve" />
         </observable>
     </observables>