Changes in / [20:30]

Location:

/vtcross/trunk

Files:

• another.xml (added)
• xml/example.ce.xml (modified) (1 diff)
• src/ezxml.c (added)
• src/ezxml.h (added)
• src/cbr.c (modified) (11 diffs)
• src/main_cognitive_radio.c (added)
• src/main_cbr.c (modified) (1 diff)
• src/cbr.h (modified) (1 diff)
• Makefile (modified) (1 diff)

/vtcross/trunk/xml/example.ce.xml

@@ -1 +1 @@
 <!--
 This is an example XML file to interface with our cognitive engine.
+The library shall create a new table "myengine" with the following cols:
+  throughput spectral_efficiency log10_ber mod_scheme tx_power SNR
 -->
 <engine name="myengine" filename="myengine.sql">

/vtcross/trunk/src/cbr.c

@@ -8 +8 @@
 
 #include "cbr.h"
+
 
 struct cbr_s {
@@ -18 +19 @@
 
 
-// open database or create database is it does not exist
+// open a database or create a database if it does not exist
 int OpenDatabase(cbr _cbr){
     int rc;
@@ -39 +40 @@
 
 
-//int cbr_callback(void *notUsed, int argc, char **argv, char **azColName)
+// simple callback function, display result
 int callback(void *notUsed, int argc, char **argv, char **azColName){
     int i;
@@ -50 +51 @@
 
 
+// execute command
 int ExecuteCommand(cbr _cbr){
     int rc;
@@ -66 +68 @@
 
 
+// execute search command
+int ExecuteSearchCommand(cbr _cbr, float *_retvals){
+    int rc;
+    //char *zErrMsg = 0;
+    unsigned int i;
+
+    printf("command: %s\n", _cbr->command);
+    sqlite3_stmt * pStatement;
+    rc = sqlite3_prepare_v2(_cbr->db, _cbr->command, -1, &pStatement, NULL);
+    if (rc == SQLITE_OK && sqlite3_step(pStatement) == SQLITE_ROW){
+        for (i=0; i<_cbr->num_columns; ++i)
+            _retvals[i] = sqlite3_column_double(pStatement, i);
+    }
+    sqlite3_finalize(pStatement);
+    
+    /*rc = sqlite3_exec(_cbr->db, _cbr->command, SearchCallback, 0, &zErrMsg);
+    if( rc!=SQLITE_OK){
+        fprintf(stderr, "SQL error: %s\n", zErrMsg);
+        sqlite3_free(zErrMsg);
+    } else{
+        printf("command executed.\n");
+    }*/
+
+    return rc;
+}
+
+
+// create database
 cbr cbr_create(char * _filename, char * _tablename, char * _cols[], unsigned int _len)
 {
@@ -108 +138 @@
 }
 
+
+// free space
 void cbr_free(cbr _cbr)
-{
-    // delete table here
-    // delete table
-    
-    /*// generate command, delete all entries of a table
-    strcpy(_cbr->command, "delete from ");
-    strcat(_cbr->command, _cbr->tablename);*/
-
+{  
     // generate command, remove a table with its content
     strcpy(_cbr->command, "drop table ");
@@ -131 +156 @@
 }
 
+
+// print 
 void cbr_print(cbr _cbr)
 {
@@ -145 +172 @@
 }
 
-//static
+
+/*//static
 int cbr_callback(void *notUsed, int argc, char **argv, char **azColName)
 {
     return 0;
-}
+}*/
+
 
 const char * ops_str[] = {
     "==", "!=", ">", ">=", "<", "<="};
 
+
+// cbr search
 int cbr_search(
     cbr _cbr,
@@ -161 +192 @@
     unsigned int _n,
     float *_retvals)
-{
-    // set up statement
-
-    /*char* zErrMsg = NULL;
-    //sqlite3_exec(_cbr->db, argv[2], callback, NULL, &zErrMsg);
-    sqlite3_exec(_cbr->db, _cbr->command, cbr_callback, NULL, &zErrMsg);*/
-
+{   
     // generate command
     strcpy(_cbr->command, "select ");
@@ -185 +210 @@
 
         strcat(_cbr->command, _names[i]);
-        //strcat(_cbr->command, " ");
         strcat(_cbr->command, ops_str[_ops[i]]);
         sprintf(str_buffer, "%E", _vals[i]);
@@ -193 +217 @@
             strcat(_cbr->command, " AND ");
         else
-            strcat(_cbr->command, ";");
-    }
-
-    //printf("command: %s\n", _cbr->command);
-    ExecuteCommand(_cbr);
-
-    return 0;
-}
-
+            strcat(_cbr->command, " order by utility desc;");
+    }
+
+    //ExecuteCommand(_cbr);
+    ExecuteSearchCommand(_cbr, _retvals);
+    
+    printf("search result: ");
+    for (i=0; i<_cbr->num_columns; i++)
+        printf("%f, ",_retvals[i]);
+    printf("\n");
+
+    return 0;
+}
+
+
+// cbr add a row
 int cbr_add_row(cbr _cbr, char *_cols[], float *_vals, unsigned int _len)
 {

/vtcross/trunk/src/main_cbr.c

@@ -7 +7 @@
 
 int main() {
-    unsigned int num_cols = 7;
-    char * cols[] = {
+    unsigned int num_cols = 7; 
+    unsigned int i;
+
+    ezxml_t f1 = ezxml_parse_file("another.xml"), engine, column;
+    char * cols[num_cols];
+    
+    for (engine = ezxml_child(f1, "engine"); engine; engine = engine->next){
+        i = 0;
+        for (column = ezxml_child(engine, "column"); column; column = column->next){
+            cols[i] = ezxml_child(column, "name")->txt;
+            i++;
+        }
+    }
+
+
+    free(f1);
+                            
+    /* char * cols[] = {
         "BER", "throughput",
         "mod_scheme", "tx_power",
         "noise_power", "path_loss",
         "utility"
-    };
+    };*/
+    
+    for (i = 0; i<num_cols; i++){
+        printf(" %s",cols[i]);
+    }
+    printf("\n");
+
     float vals[num_cols];
     vals[0] = 1e-3f;    // BER

/vtcross/trunk/src/cbr.h

@@ -4 +4 @@
 
 #include "sqlite3.h"
+#include "ezxml.h"
 
 //#define CBR_LEN_FILENAME 64

/vtcross/trunk/Makefile

@@ -3 +3 @@
 #
 
-all: cognitive_radio_test utility_test cbr_test
+TESTS = cognitive_radio utility cbr
+all: $(TESTS)
 
-main_test.o: src/main_test.c
-        gcc -Wall -c src/main_test.c -Wall -o main_test.o
+CC = gcc
+CFLAGS = -Wall -O3
+LDFLAGS = -lm -ldl -pthread -lsigprocc
 
-cognitive_radio_test.o: src/cognitive_radio_test.c
-        gcc -Wall -c src/cognitive_radio_test.c -Wall -o cognitive_radio_test.o
+OBJS = cbr.o sqlite3.o utility.o cognitive_radio_test.o ezxml.o
+HEADERS = src/cbr.h src/cognitive_radio_test.h \
+                  src/sqlite3.h src/sqlite3ext.h \
+                  src/utility.h src/cognitive_radio_test.h
 
-cognitive_radio_test: cognitive_radio_test.o main_test.o
-        gcc cognitive_radio_test.o main_test.o -Wall -lm -lsigprocc -o cognitive_radio_test
+$(OBJS) : %.o : src/%.c $(HEADERS)
+        $(CC) $(CFLAGS) -c $< -o $@
 
-utility.o: src/utility.c
-        gcc -Wall -c src/utility.c -o utility.o
-
-main_utility.o: src/main_utility.c
-        gcc -Wall -c src/main_utility.c -o main_utility.o
-
-utility_test: utility.o main_utility.o
-        gcc -Wall utility.o main_utility.o -lm -o utility_test
-
-# 
-# case database targets
-#
-
-sqlite3.o: src/sqlite3.c src/sqlite3.h
-        gcc -c src/sqlite3.c -o sqlite3.o
-
-cbr.o: src/cbr.c src/cbr.h src/sqlite3.h
-        gcc -Wall -c src/cbr.c -o cbr.o
-
-main_cbr.o: src/main_cbr.c src/cbr.h
-        gcc -Wall -c src/main_cbr.c -o main_cbr.o
-
-cbr_test: sqlite3.o cbr.o main_cbr.o
-        gcc -Wall sqlite3.o cbr.o main_cbr.o -ldl -pthread -o cbr_test
-
-#
-# cleanup
-#
+$(TESTS) : % : src/main_%.c $(OBJS)
+        $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $< -o $@
 
 clean:
-        rm -rf *.o *_test
+        rm -rf *.o $(TESTS)