Changeset 469

Timestamp:

09/07/09 17:28:20 (15 years ago)

Author:

bhilburn

Message:

Moved over the necessary CBR functionality for DSA_CE using the new C++
classes. Note that CBR code is messy and needs to be cleaned up.

Location:

vtcross/trunk/src

Files:

• cognitive_engines/DSA_CE/DSA_CognitiveEngine.cpp (modified) (12 diffs)
• cognitive_engines/DSA_CE/Makefile.am (modified) (1 diff)
• cognitive_engines/DSA_CE/cbr.c (deleted)
• include/vtcross/cbr.h (modified) (7 diffs)

vtcross/trunk/src/cognitive_engines/DSA_CE/DSA_CognitiveEngine.cpp

@@ -18 +18 @@
 #include <cstring>
 #include <stdint.h>
-#include <math.h>
-
+#include <cmath>
+
+#include "vtcross/cbr.h"
 #include "vtcross/cognitive_engine.h"
 #include "vtcross/common.h"
@@ -27 +28 @@
 #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 INTERFERENCE 0
@@ -45 +40 @@
 
 
-
-static cbr myCBR;
+static CBR *myCBR;
 
 
@@ -60 +54 @@
 CognitiveEngine::~CognitiveEngine()
 {
-    cbr_free(myCBR);
+    delete myCBR;
     delete [] pList;
     delete [] oList;
@@ -161 +155 @@
     std::string channel_name = "channel";
     searchNames[0] = (char *) channel_name.c_str();
-    searchOps[0] = EQ;
+    searchOps[0] = 0;
     searchVals[0] = parameters[0].value; 
 
     /* Execute CBR search and put output into returnValues */
-    cbr_search(myCBR, searchNames, searchOps, searchVals,
+    myCBR->Search(searchNames, searchOps, searchVals,
             1, returnValues);
 
@@ -197 +191 @@
     }
 
-    cbr_update(myCBR, nameList, obsList, valList, obsVals, 
+    myCBR->Update(nameList, obsList, valList, obsVals, 
             numberColumns, obsColumns);
 }
@@ -697 +691 @@
 
         searchNames[0] = (char*) pList[0].name.c_str();
-        searchOps[0] = EQ;
+        searchOps[0] = 0;
         searchVals[0] = i+1; 
     
-        uint32_t rc = cbr_search(myCBR, searchNames, searchOps, searchVals,
+        uint32_t rc = myCBR->Search(searchNames, searchOps, searchVals,
             1, returnValues);
 
@@ -728 +722 @@
                 /* Add the new optimized set to the CBR database */
 
-                cbr_add_row(myCBR, rowNames, returnValues, numberColumns);
+                myCBR->AddRow(rowNames, returnValues, numberColumns);
         }
 
@@ -737 +731 @@
     // Get sum of all the channel utilities.
     sumSearchName = (char *) utility_name.c_str();
-    uint32_t rc = cbr_search_sum(myCBR, sumSearchName, sumRetVals);
+    uint32_t rc = myCBR->SearchSum(sumSearchName, sumRetVals);
 
     // Psuedo random channel selection based upon utility.
@@ -752 +746 @@
         
     searchNames[0] = (char*) pList[0].name.c_str();
-    searchOps[0] = EQ;
+    searchOps[0] = 0;
     searchVals[0] = channel; 
   
-    rc = cbr_search(myCBR, searchNames, searchOps, searchVals,
+    rc = myCBR->Search(searchNames, searchOps, searchVals,
         1, returnValues);
 
@@ -800 +794 @@
 
     /* Add the new optimized set to the CBR database */
-    cbr_add_row(myCBR, allNames, returnValues, returnValueIndex+1);
+    myCBR->AddRow(allNames, returnValues, returnValueIndex+1);
 
 
@@ -863 +857 @@
     cols[columnIndex] = (char *)utility_name.c_str();
 
-    myCBR = cbr_create_with_primary(filename, tablename, cols, paramCols, numberColumns, radioInfo->numParameters);
-}
-
+    myCBR = new CBR(filename, tablename, cols, paramCols, numberColumns, radioInfo->numParameters);
+}
+

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

@@ -20 +20 @@
 
 bin_PROGRAMS = DSA_Demo
-include_HEADERS = cbr.c
 
 DSA_Demo_SOURCES = DSA_CognitiveEngine.cpp DSA_Demo.cpp

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

@@ -34 +34 @@
 #include <stdint.h>
 #include <string>
+
 #include <sqlite3.h>
 
@@ -49 +50 @@
 {
     public:
-        /* Default constructor and preferred constructor for the CBR class. */
+        /* Constructors for the CBR class. */
         CBR();
         CBR(char *_filename, char *_tablename, char *_cols[], uint32_t _len);
+        CBR(char *_filename, char *_tablename, char *_cols[], \
+                char *_primcols[], uint32_t _len, uint32_t  _primlen);
 
         /* Destructor for the CBR class. Note that this destructor will be
@@ -68 +71 @@
         virtual int32_t Search(char *_names[], int32_t *_ops, float *_vals, \
                 uint32_t _n, float *_retvals);
+        virtual int32_t SearchSum(char *_name, float *_retvals);
+        virtual int32_t SearchRand(char *_names[], int * _ops, float *_vals, unsigned int _n, \
+            float *_retvals);
 
         virtual int32_t Update(char *_where[], char *_set[], float *_wherevals, \
@@ -167 +173 @@
     // execute create database command
     // database handle
-    //_cbr->db = NULL;
+    //db = NULL;
     OpenDatabase();
 
@@ -193 +199 @@
     ExecuteCommand();
 }
+
+// create database
+CBR::CBR(char * _filename, char * _tablename, 
+        char * _cols[], char * _primcols[], unsigned int _len,
+        unsigned int _primlen)
+{
+    // 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");
+        strcat(command, ", ");
+    }
+   strcat(command, "PRIMARY KEY (");
+    for (i=0; i<_primlen; i++) {
+        strcat(command, _primcols[i]);
+        if (i != _primlen-1) // not last entry
+            strcat(command, ", ");
+    }
+    strcat(command, "));");
+
+    // execute create table command
+    ExecuteCommand();
+}
+
 
 
@@ -276 +328 @@
 }
 
+// cbr search for a sum
+int32_t 
+CBR::SearchSum(
+    char *_name,
+    float *_retvals)
+{   
+    int rc;
+    // generate command
+    strcpy(command, "select SUM( ");
+    strcat(command, tablename);
+    strcat(command, ".");
+    strcat(command, _name);
+    strcat(command, ") from ");
+    strcat(command, tablename);
+    strcat(command, ";");
+
+    //printf("search command: %s\n", command);
+
+    rc = ExecuteSearchCommand(_retvals);
+    /*printf("search result: ");
+    for (int i=0; i<numColumns; i++)
+        printf("%f, ",_retvals[i]);
+    printf("\n");
+    */
+    return rc;
+}
+
+
+// cbr search
+int32_t 
+CBR::SearchRand(
+    char *_names[],
+    int * _ops,
+    float *_vals,
+    unsigned int _n,
+    float *_retvals)
+{   
+        const char *ops_str[] = {"==", "!=", ">", ">=", "<", "<="};
+    int rc;
+    // generate command
+    strcpy(command, "select ");
+    strcat(command, tablename);
+    strcat(command, ".* from ");
+    strcat(command, tablename);
+    strcat(command, " where ");
+
+    unsigned int i;
+    char str_buffer[64];
+    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, ops_str[_ops[i]]);
+        sprintf(str_buffer, "%E", _vals[i]);
+        strcat(command, str_buffer);
+
+        if (i<_n-1)
+            strcat(command, " AND ");
+        else
+            strcat(command, " order by RAND();");
+    }
+
+    //printf("search command: %s\n", command);
+
+    rc = ExecuteSearchCommand(_retvals);
+    
+    /*printf("search result: ");
+    for (i=0; i<numColumns; i++)
+        printf("%f, ",_retvals[i]);
+    printf("\n");
+*/
+    return rc;
+}
+
+
+
 
 // update a row 
@@ -335 +467 @@
     strcat(command, " values(");
     for (i=0; i<_len; i++) {
-        // ???? how to fill the values if _cbr->numColumns != _len
+        // ???? how to fill the values if numColumns != _len
         // assume = in the following
         sprintf(command, "%s%f", command, _vals[i]);