Changeset 469 for vtcross/trunk/src/cognitive_engines/DSA_CE/DSA_CognitiveEngine.cpp

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.

Files:

• vtcross/trunk/src/cognitive_engines/DSA_CE/DSA_CognitiveEngine.cpp (modified) (12 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);
+}
+