Changeset 470

Timestamp:

09/07/09 18:11:52 (15 years ago)

Author:

bhilburn

Message:

Converted the OSSIE CE over to the C++ CBR by creating a child class of
the base CBR. Code is ugly, needs to be cleaned.

Location:

vtcross/trunk/src

Files:

• cognitive_engines/OSSIE_DEMO_CE/Makefile.am (modified) (1 diff)
• cognitive_engines/OSSIE_DEMO_CE/OSSIE_CE.cpp (modified) (8 diffs)
• cognitive_engines/OSSIE_DEMO_CE/cbr.c (deleted)
• include/vtcross/cbr.h (modified) (1 diff)

vtcross/trunk/src/cognitive_engines/OSSIE_DEMO_CE/Makefile.am

@@ -6 +6 @@
 
 bin_PROGRAMS = OSSIE_Demo
-include_HEADERS = cbr.c
 
 OSSIE_Demo_SOURCES = OSSIE_CE.cpp OSSIE_Demo.cpp

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

@@ -14 +14 @@
 #include <math.h>
 
+#include "vtcross/cbr.h"
 #include "vtcross/cognitive_engine.h"
 #include "vtcross/common.h"
@@ -20 +21 @@
 #include "vtcross/error.h"
 #include "vtcross/socketcomm.h"
-#include "vtcross/cbr.h"
-
-// TODO this is really bad; need to move to a proper cbr.h
-#include "cbr.c"
-
-#include "sqlite3.h"
-#include "sqlite3ext.h"
+
 
 #define TXPOWER 1
@@ -37 +32 @@
 #define EVF 20
 
-static cbr myCBR;
-
+
+class ossieCBR : public CBR
+{
+    public:
+        ossieCBR();
+
+        ossieCBR(char * _filename, char * _tablename, char * _cols[], unsigned int _len);
+
+        ~ossieCBR(){};
+
+        int32_t Update(char *_where[], char*_set[], float *_wherevals, float *_setvals, 
+                unsigned int _wherelen, unsigned int _setlen);
+
+        int32_t Search(char *_names[], int * _ops, float *_vals, unsigned int _n,
+            float *_retvals, int evf);
+};
+
+
+
+ossieCBR::ossieCBR(char * _filename, char * _tablename, char * _cols[], unsigned int _len)
+{
+    // create database
+
+    // copy filename
+    unsigned int i=0;
+    strcpy(filename, _filename);
+
+    // execute create database command
+    // database handle
+    //db = NULL;
+    OpenDatabase();
+
+    // create table
+
+    // copy tablename
+    strcpy(tablename, _tablename);
+
+    // number of columns in the table
+    numColumns = _len;
+
+    // generate command
+    strcpy(command, "CREATE TABLE ");
+    strcat(command, tablename);
+    strcat(command, "(");
+    for (i=0; i<numColumns; i++) {
+        strcat(command, _cols[i]);
+        strcat(command, " FLOAT");
+        if (i != numColumns-1) // not last entry
+            strcat(command, ", ");
+    }
+    strcat(command, ", timestamp DATE, PRIMARY KEY(tx_power));");
+
+    // execute create table command
+    ExecuteCommand();
+}
+
+
+
+// cbr search
+int32_t 
+ossieCBR::Search(
+    char *_names[],
+    int * _ops,
+    float *_vals,
+    unsigned int _n,
+    float *_retvals,
+    int evf)
+{   
+    int rc;
+    float lower_limit;
+    float upper_limit;
+    // generate command
+    strcpy(command, "select ");
+    strcat(command, tablename);
+    strcat(command, ".* from ");
+    strcat(command, tablename);
+    strcat(command, " where ");
+
+    unsigned int i;
+    char str_buffer[64];
+    //printf("number of ops %d:\n", _n);
+    for (i=0; i<_n; i++) {
+        // ensure valid ops value
+        if (_ops[i] < 0 || _ops[i] > 5) {
+            printf("error: cbr_search(), invalid ops id : %d\n", _ops[i]);
+            exit(1);
+        }
+
+        strcat(command, _names[i]);
+        strcat(command, " between ");
+        
+        lower_limit = _vals[i]*(1-((float)evf/100));
+        upper_limit = _vals[i]*(1+((float)evf/100));
+
+        printf("%f %f %f\n", lower_limit, upper_limit, _vals[i]);
+
+        sprintf(command, "%s%f", command, lower_limit);
+        strcat(command, " and ");
+        sprintf(command, "%s%f", command, upper_limit);
+
+
+        if (i<_n-1)
+            strcat(command, " AND ");
+        else
+            strcat(command, " order by abs(utility) asc, timestamp desc;");
+    }
+
+    printf("search command: %s\n", command);
+
+    rc = ExecuteSearchCommand(_retvals);
+    
+    printf("search result: ");
+    for (i=0; i<numColumns +1; i++)
+        printf("%f, ",_retvals[i]);
+    printf("\n");
+
+    return rc;
+}
+
+
+// update a row 
+int32_t 
+ossieCBR::Update(char *_where[], char*_set[], float *_wherevals, float *_setvals, 
+                uint32_t _wherelen, uint32_t _setlen)
+{
+    unsigned int i;
+    
+    // generate command
+    //printf("%s\n", command);
+    strcpy(command, "UPDATE ");
+    strcat(command, tablename);
+    
+    strcat(command, " SET ");
+    for (i=0; i<_setlen; i++) {
+        strcat(command, _set[i]);
+        strcat(command, " = ");
+        sprintf(command, "%s%f", command, _setvals[i]);
+        strcat(command, "  ");
+        if (i != _setlen-1) // not last entry
+            strcat(command, ", ");
+    }
+   
+    strcat(command, ", timestamp = DATETIME('NOW')");
+    
+    strcat(command, " WHERE ");
+
+    for (i=0; i<_wherelen; i++) {
+        strcat(command, _where[i]);
+        strcat(command, " = ");
+        sprintf(command, "%s%f", command, _wherevals[i]);
+        strcat(command, "  ");
+        if (i != _wherelen-1) // not last entry
+            strcat(command, "AND ");
+    }
+    strcat(command, ";");
+    
+    //printf("update command: %s\n", command);
+    // execute add command
+    ExecuteCommand();
+
+    return 0;
+}
+
+static ossieCBR *myCBR;
 
 CognitiveEngine::CognitiveEngine()
@@ -50 +207 @@
 CognitiveEngine::~CognitiveEngine()
 {
-    cbr_free(myCBR);
+    delete myCBR;
+
     delete [] pList;
     delete [] oList;
@@ -158 +316 @@
 
     // cbr_update(database,where,set,whereval,setval,..)
-    cbr_update(myCBR, nameList, utilList, valList, newUtilityVals, 
+    myCBR->Update(nameList, utilList, valList, newUtilityVals, 
             numberColumns, utilColumns);
 }
@@ -670 +828 @@
          */
         if(strcmp(uList[i].goal.c_str(), "max") == 0) {
-            searchOps[i] = GT;
+            searchOps[i] = 2;
         } else if(strcmp(uList[i].goal.c_str(), "min") == 0) {
-            searchOps[i] = LT;
-        }
-    }
-
-    cbr_print(myCBR);
+            searchOps[i] = 4;
+        }
+    }
+
+    myCBR->Print();
 
     /* CBR specific call */
-    uint32_t rc = cbr_search(myCBR, searchNames, searchOps, searchVals,
+    uint32_t rc = myCBR->Search(searchNames, searchOps, searchVals,
             radioInfo->numUtilities, returnValues, EVF);
 
@@ -740 +898 @@
 
     // Add row to CBR. 
-    cbr_add_row(myCBR, allNames, returnValues, returnValueIndex+1);
+    myCBR->AddRow(allNames, returnValues, returnValueIndex+1);
 
     return pList;
@@ -792 +950 @@
     cols[columnIndex] = (char *)"utility";
 
-    myCBR = cbr_create(filename, tablename, cols, numberColumns);
-}
-
+    myCBR = new ossieCBR(filename, tablename, cols, numberColumns);
+}
+

vtcross/trunk/src/include/vtcross/cbr.h

@@ -51 +51 @@
     public:
         /* Constructors for the CBR class. */
-        CBR();
+        CBR(){};
         CBR(char *_filename, char *_tablename, char *_cols[], uint32_t _len);
         CBR(char *_filename, char *_tablename, char *_cols[], \