Index: vtcross/trunk/src/include/vtcross/cbr.h
===================================================================
--- vtcross/trunk/src/include/vtcross/cbr.h	(revision 509)
+++ vtcross/trunk/src/include/vtcross/cbr.h	(revision 518)
@@ -15,6 +15,7 @@
 */
 
-/* This file contains the full implementation of the CBR class - the default
- * VTCROSS case-based reasoner.
+/*! This header contains the declaration and a full implementation of 
+ * the CBR class - the default CROSS case-based reasoner, which can be used as a
+ * backend for cognitive engines.
  */
 
@@ -39,11 +40,11 @@
 
 
-#define DATABASENAME "vtcross_cbr"
+#define DATABASENAME "cross_cbr"
 
 
 /* This is an internal debugging function used by some sqlite3 function calls.
- * It is not used otherwise in the VTCROSS codebase. */
-int32_t 
-callback(void *notUsed, int argc, char **argv, char **azColName)
+ *  It is not used otherwise in the CROSS codebase. */
+int32_t 
+callback(void *notUsed, int32_t argc, char **argv, char **azColName)
 {
     for(size_t i = 0; i < argc; i++) {
@@ -56,5 +57,7 @@
 
 
-/* The CBR class is designed to used as either as-is, or as a parent class.  All
+/*! \brief Case-Based Reasoner class declaration.
+ *
+ * The CBR class is designed to used as either as-is, or as a parent class.  All
  * functions are declared virtual, and internal members are 'protected' rather
  * than private. If you require functionality in a CBR not specifically provided
@@ -66,5 +69,7 @@
 {
     public:
-        /* Constructors for the CBR class. Note that the default constructor
+        /*! \brief Constructors for the CBR class. 
+         *
+         * Note that the default constructor
          * must be defined inline here so that super-calls from child classes
          * don't fail (i.e. we cannot rely on the compiler-provided constructor. */
@@ -74,24 +79,34 @@
                 string _primcols[], uint32_t _len, uint32_t _primlen);
 
-        /* Destructor for the CBR class. Note that this destructor will be
+        /*! \brief Destructors for the CBR class.
+         *
+         * Destructor for the CBR class. Note that this destructor will be
          * called automatically by any derived classes, and so child classes
          * should not repeat the freeing actions performed in this function. */
         virtual ~CBR();
 
-        /* This function opens the VTCROSS database, or if it has not been
+        /*! \brief Open/Create a sqlite database for the CBR.
+         *
+         * This function opens the CROSS database, or if it has not been
          * created yet, creates it. */
         virtual int32_t OpenDatabase();
 
-        /* Execute a sqlite3 command and return the sqlite3 return code. */
+        /*! \brief  Execute a sqlite command.
+         *
+         * Construct and execute a sqlite3 command and pass the return code back. */
         virtual int32_t ExecuteCommand();
 
-        /* Execute a sqlite3 search command and store the results in the passed
+        /*! \brief Search the sqlite3 database. 
+         *
+         * Execute a sqlite3 search command and store the results in the passed
          * retvals argument. */
         virtual int32_t ExecuteSearchCommand(float *_retvals);
 
-        /* Print the VTCROSS sqlite3 database. */
+        /*! \brief Print the CROSS sqlite database. */
         virtual void Print();
 
-        /* Search the VTCROSS database for specific fields and store the results
+        /*! \brief Search the CBR database. 
+         *
+         * Search the CROSS database for specific fields and store the results
          * in the passed retvals argument. */
         virtual int32_t Search(string _names[], int32_t *_ops, float *_vals, \
@@ -101,9 +116,9 @@
             float *_retvals);
 
-        /* Update a row in the VTCROSS sqlite3 database. */
+        /*! \brief Update an entry in the CBR database.  */
         virtual int32_t Update(string _where[], string _set[], float *_wherevals, \
                 float *_setvals, uint32_t _wherelen, uint32_t _setlen);
 
-        /* Add a row to the VTCROSS sqlite3 database. */
+        /*! \brief Add a row to the CROSS sqlite3 database. */
         virtual int32_t AddRow(string _cols[], float *_vals, uint32_t _len);
 
@@ -129,5 +144,5 @@
 
     /* Generate the command that will create the initial table within the
-     * VTCROSS database. */
+     * CROSS database. */
     command = "CREATE TABLE " + tablename + "(";
     for(size_t i = 0; i < numColumns; i++) {
@@ -159,5 +174,5 @@
 
     /* Generate the command that will create the initial table within the
-     * VTCROSS database with primary keys. */
+     * CROSS database with primary keys. */
     command = "CREATE TABLE " + tablename + "(";
     for(size_t i = 0; i < numColumns; i++) {
