Changeset 525

Timestamp:

12/07/09 12:44:58 (14 years ago)

Author:

bhilburn

Message:

Recreated the CognitiveEngine? class, inherited and implemented it with
the CBR_CE test class. Seems to be working so far.

Location:

vtcross/branches/engineTreeFix/src/cognitive_engines

Files:

• CBR_CE/CBR_CE.cpp (added)
• CBR_CE/CognitiveEngine.cpp (deleted)
• CBR_CE/Makefile.am (modified) (1 diff)
• CBR_CE/cbr_demo.cpp (modified) (1 diff)
• CognitiveEngine.cpp (modified) (4 diffs)
• Makefile.am (modified) (1 diff)

vtcross/branches/engineTreeFix/src/cognitive_engines/CBR_CE/Makefile.am

@@ -21 +21 @@
 bin_PROGRAMS = cbr_demo
 
-cbr_demo_SOURCES = CognitiveEngine.cpp cbr_demo.cpp
-cbr_demo_LDADD = -lsqlite3 $(CROSS_SOCKETCOMM_LA) 
+cbr_demo_SOURCES = CBR_CE.cpp cbr_demo.cpp
+cbr_demo_DEPENDENCIES = ../libce.a
+cbr_demo_LDADD = -lsqlite3 ../libce.a $(CROSS_SOCKETCOMM_LA) 
 

vtcross/branches/engineTreeFix/src/cognitive_engines/CBR_CE/cbr_demo.cpp

@@ -41 +41 @@
        ERROR(1, "Usage: %s hostname port\n", argv[0]);
     
-    CognitiveEngine cognitiveEngine(argv[1], argv[2], false);
+    CognitiveEngine cognitiveEngine(argv[1], argv[2], 10, false);
 
     LOG("Waiting for signal...\n");

vtcross/branches/engineTreeFix/src/cognitive_engines/CognitiveEngine.cpp

@@ -26 +26 @@
 #include <string>
 
-#include "vtcross/cbr.h"
 #include "vtcross/cognitive_engine.h"
 #include "vtcross/common.h"
@@ -100 +99 @@
         ReceiveRadioConfiguration();
         ReceiveExperience();
-    }
-}
-
-void 
-CognitiveEngine::ReceiveFeedback(Observable *observables, Parameter *parameters)
-{ 
-    LOG("Cognitive Engine:: Receiving feedback.\n");
-    
-    uint32_t numberColumns = radioInfo->numParameters + radioInfo->numUtilities;
-
-    uint32_t obsColumns = radioInfo->numObservables + 1;
-
-    float valList[numberColumns];
-    float obsVals[numberColumns];
-    string nameList[numberColumns];
-    string obsList[obsColumns];
-
-    size_t columnObsIndex = 0;
-    for (size_t i = 0; i < radioInfo->numObservables; i++){
-        obsList[columnObsIndex] = observables[i].name;
-        columnObsIndex++;
-    }  
-    obsList[columnObsIndex] = "utility";
-
-    size_t columnIndex = 0;
-    for (size_t i = 0; i < radioInfo->numParameters; i++){
-        nameList[columnIndex] = parameters[i].name;
-        columnIndex++;
-    }   
-    for (size_t i = 0; i < radioInfo->numUtilities; i++){
-        nameList[columnIndex] = uList[i].name;
-        columnIndex++;
-    }   
-
-    size_t obsValueIndex = 0;
-    for(size_t i = 0; i < radioInfo->numObservables; i++) {
-        obsVals[obsValueIndex] = observables[i].value;
-        obsValueIndex++;
-    }
-
-    /* Calculate Utility */
-    float newUtilityValue = 0;
-
-    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        newUtilityValue = newUtilityValue + (uList[i].target - observables[i].value);
-    }
-    obsVals[obsValueIndex] = newUtilityValue;
-
-    size_t returnValueIndex = 0;
-    for(size_t i = 0; i < radioInfo->numParameters; i++) {
-        valList[returnValueIndex] = parameters[i].value;
-        returnValueIndex++;
-    }
-    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        valList[returnValueIndex] = uList[i].target;
-        returnValueIndex++;
     }
 }
@@ -420 +363 @@
 
 void 
+CognitiveEngine::ReceiveFeedback(Observable *observables,Parameter *parameters)
+{
+    LOG("Cognitive Engine:: Receiving feedback.\n");
+
+    LOG("CognitiveEngine:: ReceiveFeedback not implemented.\n");
+}
+
+
+void 
 CognitiveEngine::ReceiveFeedback(Observable *observables, Parameter *parameters, \
     std::string service)
@@ -451 +403 @@
 
 void 
-PerformUpdatePerformance()
-{
-}
-
-
-void
-PerformRequestOptimizationService()
-{
-}
-
-
-void
-PerformRequestOptimization()
-{
-}
-
-
-void
-PerformQueryComponentType()
-{
-}
-
-
-void
-PerformConnectSML()
-{
-}
-
-
-void
-PerformDisconnectSML()
-{
-}
-
-
-void
-PerformResetEngineCognitive()
-{
-}
-
-
-void
-PerformShutdownEngineCognitive()
+CognitiveEngine::PerformUpdatePerformance()
+{
+}
+
+
+void
+CognitiveEngine::PerformRequestOptimizationService()
+{
+}
+
+
+void
+CognitiveEngine::PerformRequestOptimization()
+{
+}
+
+
+void
+CognitiveEngine::PerformQueryComponentType()
+{
+}
+
+
+void
+CognitiveEngine::PerformConnectSML()
+{
+}
+
+
+void
+CognitiveEngine::PerformDisconnectSML()
+{
+}
+
+
+void
+CognitiveEngine::PerformResetEngineCognitive()
+{
+}
+
+
+void
+CognitiveEngine::PerformShutdownEngineCognitive()
 {
 }

vtcross/branches/engineTreeFix/src/cognitive_engines/Makefile.am

@@ -15 +15 @@
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = CBR_CE DSA_CE OSSIE_DEMO_CE
+INCLUDES = -I$(top_srcdir)/src/include
+
+AM_CXXFLAGS = -Wall -g
+
+noinst_LIBRARIES = libce.a
+libce_a_SOURCES = CognitiveEngine.cpp
+
+SUBDIRS = . CBR_CE #DSA_CE OSSIE_DEMO_CE