Changeset 468 for vtcross/trunk/src/cognitive_engines/CBR_CE/CognitiveEngine.cpp

Timestamp:

09/07/09 17:04:29 (15 years ago)

Author:

bhilburn

Message:

Fully implemented the CBR as a C++ class, and using it within the CBR_CE
component.

Files:

• vtcross/trunk/src/cognitive_engines/CBR_CE/CognitiveEngine.cpp (modified) (7 diffs)

vtcross/trunk/src/cognitive_engines/CBR_CE/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"
@@ -26 +27 @@
 #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"
-
-
-static cbr myCBR;
-
+
+static CBR *myCBR;
 
 CognitiveEngine::CognitiveEngine()
@@ -48 +40 @@
 CognitiveEngine::~CognitiveEngine()
 {
-    cbr_free(myCBR);
+    delete myCBR;
+
     delete [] pList;
     delete [] oList;
@@ -160 +153 @@
     }
 
-    cbr_update(myCBR, nameList, obsList, valList, obsVals, 
+    myCBR->Update(nameList, obsList, valList, obsVals, 
             numberColumns, obsColumns);
 }
@@ -670 +663 @@
          * If the goal is to minimize, set the search operation to
          * return values less than the target.
+         *
+         * NOTE: the values '2' and '4' here are from some old preprocesser
+         * definitions, which I will copy here until I can figure out just what
+         * exactly they were for:
+                42      #define EQ 0    // equals
+                43      #define NE 1    // not equals
+                44      #define GT 2    // greater than
+                45      #define GE 3    // greater than or equal to
+                46      #define LT 4    // less than
+                47      #define LE 5    // less than or equal to
          */
         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;
+            searchOps[i] = 4;
         }
     }
 
     /* CBR specific call */
-    uint32_t rc = cbr_search(myCBR, searchNames, searchOps, searchVals,
+    uint32_t rc = myCBR->Search(searchNames, searchOps, searchVals,
             radioInfo->numUtilities, returnValues);
 
@@ -739 +742 @@
 
     // Add row to CBR. 
-    cbr_add_row(myCBR, allNames, returnValues, returnValueIndex+1);
+    myCBR->AddRow(allNames, returnValues, returnValueIndex+1);
 
     return pList;
@@ -791 +794 @@
     cols[columnIndex] = (char *) "utility";
 
-    myCBR = cbr_create(filename, tablename, cols, numberColumns);
-}
-
+    myCBR = new CBR(filename, tablename, cols, numberColumns);
+}
+