Changeset 554

Timestamp:

05/17/10 03:14:03 (14 years ago)

Author:

nikhil

Message:

 

Location:

vtcross/branches/nikhil/crossmodel1

Files:

• . (copied) (copied from vtcross/trunk)
• src/cognitive_engines/CBR.cpp (modified) (3 diffs)
• src/cognitive_engines/CBR_CE/CBR_CE.cpp (modified) (12 diffs)
• src/cognitive_engines/CBR_CE/CBR_CE.h (modified) (5 diffs)
• src/cognitive_engines/CognitiveEngine.cpp (modified) (13 diffs)
• src/include/vtcross/cognitive_engine.h (modified) (4 diffs)
• src/include/vtcross/components.h (modified) (1 diff)
• src/include/vtcross/cross_shell.h (modified) (2 diffs)
• src/include/vtcross/libvtcross.h (modified) (1 diff)
• src/libvtcross/Makefile.am (modified) (2 diffs)
• src/libvtcross/libvtcross.cpp (modified) (5 diffs)
• src/libvtcross/libvtcross_demo.cpp (modified) (5 diffs)
• src/shell/CognitiveRadioShell.cpp (modified) (14 diffs)
• src/shell/configs/demo.xml (modified) (2 diffs)

vtcross/branches/nikhil/crossmodel1/src/cognitive_engines/CBR.cpp

@@ -21 +21 @@
 
 #include "vtcross/cbr.h"
-
+#include <iostream>
 
 using namespace std;
@@ -66 +66 @@
      * use. */
     ExecuteCommand();
+
+    std::cout << "Table Created" << std::endl;
 }
 
@@ -207 +209 @@
             command += " AND ";
         else
-            command += " order by utility desc;";
+            command += ";";
         
     }

vtcross/branches/nikhil/crossmodel1/src/cognitive_engines/CBR_CE/CBR_CE.cpp

@@ -20 +20 @@
 
 #include "CBR_CE.h"
-
+#include <iostream>
 
 using namespace std;
@@ -33 +33 @@
 
 
-void 
-CBR_CE::RegisterServices()
-{
-    LOG("Cognitive Engine:: Registering services.\n");
-
-    SendMessage(commandSocketFD, "register_service");
-    SendMessage(commandSocketFD, "test_srv");
-
-    SendMessage(commandSocketFD, "register_service");
-    SendMessage(commandSocketFD, "test_srv1");
-
-    SendMessage(commandSocketFD, "register_service");
-    SendMessage(commandSocketFD, "test_srv2");
-
-    SendMessage(commandSocketFD, "register_service");
-    SendMessage(commandSocketFD, "test_srv3");
-
-}
-
-
-void 
-CBR_CE::DeregisterServices()
-{
-    LOG("Cognitive Engine:: Deregistering services.\n");
-
-    SendMessage(commandSocketFD, "deregister_service");
-    SendMessage(commandSocketFD, "test_srv");
-
-    SendMessage(commandSocketFD, "deregister_service");
-    SendMessage(commandSocketFD, "test_srv1");
-
-    SendMessage(commandSocketFD, "deregister_service");
-    SendMessage(commandSocketFD, "test_srv2");
-
-    SendMessage(commandSocketFD, "deregister_service");
-    SendMessage(commandSocketFD, "test_srv3");
-
-}
-
-
 Parameter* 
-CBR_CE::GetSolution(Observable *observables, Parameter *currentParameters)
+CBR_CE::GetSolution(Observable *observables, Parameter *currentParameters, Utility *utilities)
 {
     LOG("Cognitive Engine:: Generating solution.\n");
@@ -81 +41 @@
 
     for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        searchNames[i] = observables[i].name;
+        searchNames[i] = uList[i].name;
     }
 
@@ -90 +50 @@
     }
 
-    uint32_t numberColumns = radioInfo->numUtilities + radioInfo->numParameters \
-                             + radioInfo->numObservables + 1;
+    uint32_t numberColumns = radioInfo->numParameters + radioInfo->numUtilities + radioInfo->numObservables + 1;
     
     float returnValues[numberColumns];
@@ -129 +88 @@
         LOG("Cognitive Engine:: Found\n");
 
-        /* Should do a random adaptation.. */
-        if(returnValues[numberColumns-1] < 0) {
-            returnValues[2] = returnValues[2] - 15;
-            returnValues[3] = returnValues[3] - 2;
-        } else {
-            returnValues[2] = returnValues[2] + 15;
-            returnValues[3] = returnValues[3] + 2;
-        }
     } else if(rc == 31337) {
         LOG("Cognitive Engine:: Not Found.\n");
         /* No rows in the CBR, pick default parameters */
         /* Currently this is hard coded and implementation specific! */
-        returnValues[2] = currentParameters[0].value + 5;
-        returnValues[3] = currentParameters[1].value + 10;
-        
-    } else {
-        LOG("Cognitive Engine:: Search return an invalid value.\n");
-    }
+
+        for (int i = 0; i < radioInfo->numParameters; i++) {
+            returnValues[i] = currentParameters[i].value + pList[i].step;
+            if (returnValues[i] > pList[i].max) {
+                std::cout << "SORRY CANT EXCEED MAX VALUE" << std::endl;
+                returnValues[i] = returnValues[i] - pList[i].step;
+            }
+            if (returnValues[i] < pList[i].min) {
+                std::cout << "SORRY CANT GO BELOW MIN VALUE" << std::endl;
+                returnValues[i] = returnValues[i] + pList[i].step ;              
+            }
+        }
+
+        for (int i = 0; i < radioInfo->numUtilities; i++)
+            returnValues[radioInfo->numParameters + i] = uList[i].value;
+
+        for (int i = 0; i < radioInfo->numObservables; i++)
+            returnValues[radioInfo->numParameters + radioInfo->numUtilities + i] = oList[i].value;
 
     size_t returnValueIndex = 0;
     for(size_t i = 0; i < radioInfo->numUtilities; i++) {
+        pList[i].value = returnValues[returnValueIndex];
+        returnValueIndex++;
+    }
+    for(size_t i = 0; i < radioInfo->numParameters; i++) {
         uList[i].value = returnValues[returnValueIndex];
-        returnValueIndex++;
-    }
-    for(size_t i = 0; i < radioInfo->numParameters; i++) {
-        pList[i].value = returnValues[returnValueIndex];
         returnValueIndex++;
     }
@@ -165 +128 @@
     string allNames[numberColumns];
     size_t allNameIndex = 0;
-    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
-        allNames[allNameIndex] = uList[i].name;
-        returnValues[allNameIndex] = uList[i].target;
-        allNameIndex++;
-    }
     for(size_t i = 0; i < radioInfo->numParameters; i++) {
         allNames[allNameIndex] = pList[i].name;
         allNameIndex++;
     }
+    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
+        allNames[allNameIndex] = uList[i].name;
+        allNameIndex++;
+    }
     for(size_t i = 0; i < radioInfo->numObservables; i++) {
         allNames[allNameIndex] = oList[i].name;
-        returnValues[allNameIndex] = 0;
         allNameIndex++;
     }
-    allNames[allNameIndex] = "utility";
+    allNames[allNameIndex] = "TotalWeight";
 
     // Add row to CBR. 
     myCBR->AddRow(allNames, returnValues, returnValueIndex + 1);
 
+        } else {
+        LOG("Cognitive Engine:: Search return an invalid value.\n");
+    }
+
+
     return pList;
 }
 
 
-Parameter* 
-CBR_CE::GetSolution(Observable *observables, \
-        Parameter *currentParameters, std::string service)
-{
-    LOG("Cognitive Engine:: Generating solution for %s service.\n", service.c_str());
-
-    return pList;
-}
-
-
 void 
-CBR_CE::ReceiveFeedback(Observable *observables, Parameter *parameters)
+CBR_CE::ReceiveFeedback(Observable *observables, Parameter *parameters, Utility *utilities)
 { 
     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;
+    uint32_t numberColumns = radioInfo->numParameters + radioInfo->numUtilities + radioInfo->numObservables + 1;
+
+    uint32_t whereLen = radioInfo->numParameters;
+    uint32_t setLen = radioInfo->numUtilities + radioInfo->numObservables;
+
+
+    float whereValue[whereLen];
+    float setValue[setLen];
+    string whereList[whereLen];
+    string setList[setLen];
+
+
+    for(size_t i = 0; i < radioInfo->numParameters; i++) {
+        whereList[i] = parameters[i].name;
+        whereValue[i] = parameters[i].value;
+    }
+
+    size_t returnValueIndex = 0;
+    for(size_t i = 0; i < radioInfo->numUtilities; i++) {
+        setList[returnValueIndex] = utilities[i].name;
+        setValue[returnValueIndex] = utilities[i].value;   
+        returnValueIndex++;
+    }
     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++;
-    }
-}
-
-
-void 
-CBR_CE::ReceiveFeedback(Observable *observables, Parameter *parameters, \
-    std::string service)
-{
-    LOG("Cognitive Engine:: Receiving feedback.\n");
+        setList[returnValueIndex] = observables[i].name;
+        setValue[returnValueIndex] = observables[i].value;
+        returnValueIndex++;
+    }
+
+
+myCBR->Update(whereList,setList,whereValue,setValue,whereLen,setLen);
+
 }
 
@@ -267 +198 @@
 {
     string filename = "ex1";
+    string filename2 = "ex2";
     string tablename = "data";
 
-    uint32_t numberColumns = radioInfo->numUtilities + radioInfo->numParameters \
+    uint32_t numberColumns = radioInfo->numParameters + radioInfo->numUtilities \
                              + radioInfo->numObservables + 1;
 
+    uint32_t numberParameters = radioInfo->numParameters;
+    uint32_t numberUtilities = radioInfo->numUtilities;
+
     string cols[numberColumns];
+    string Plist[numberParameters];
+    string Ulist[numberUtilities];
+    float Utarget[numberUtilities];
+    string Ugoal[numberUtilities];
 
     size_t columnIndex = 0;
+    size_t Pindex = 0;              // new
+    size_t Uindex = 0;              // new
+
+
+    for (size_t i = 0; i < radioInfo->numParameters; i++){
+        cols[columnIndex] = pList[i].name;
+        columnIndex++;
+        Plist[Pindex] = pList[i].name;   // new
+        Pindex++;                        // new
+    }
     for (size_t i = 0; i < radioInfo->numUtilities; i++){
         cols[columnIndex] = uList[i].name;
         columnIndex++;
-    }   
-    for (size_t i = 0; i < radioInfo->numParameters; i++){
-        cols[columnIndex] = pList[i].name;
-        columnIndex++;
-    }   
-    for (size_t i = 0; i < radioInfo->numObservables; i++){
+        Ulist[Uindex] = uList[i].name;     // new
+        Utarget[Uindex] = uList[i].target; // new
+        Ugoal[Uindex] = uList[i].goal;     // new
+        Uindex++;                          // new
+
+    }      
+    for (size_t i = 0; i < radioInfo->numObservables; i++){   
         cols[columnIndex] = oList[i].name;
-        columnIndex++;
-    }   
-    cols[columnIndex] = "utility";
+        columnIndex++;
+    }
+    cols[columnIndex] = "TotalWeight";  
 
     myCBR = new CBR(filename, tablename, cols, numberColumns);
+
 }
 
@@ -296 +247 @@
 CBR_CE::PerformUpdatePerformance()
 {
+
     /* Receive Set of current Parameters */
     char buffer[256];
@@ -314 +266 @@
     } 
 
+
     /* Receive Set of Observables */
     memset(buffer, 0, 256);
@@ -329 +282 @@
         ReadMessage(commandSocketFD, buffer);
         o[i].value = atof(buffer);
-    }  
-
-    ReceiveFeedback(o, p);
+    }
+
+
+    /* Receive Set of Utilities */
+    memset(buffer, 0, 256);
+    ReadMessage(commandSocketFD, buffer);
+    uint32_t numUtilities = atoi(buffer);
+    
+    Utility *u = new Utility[numUtilities];
+
+    for(size_t i = 0; i < numUtilities; i++) {
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD, buffer);
+        u[i].name = std::string(buffer);
+        
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD, buffer);
+        u[i].value = atof(buffer);
+    }
+ 
+    ReceiveFeedback(o, p, u);
 
     delete [] o;
     delete [] p;
+    delete [] u;
 }
 
 
 void
-CBR_CE::PerformRequestOptimizationService()
-{
-   // THIS IS CURRENTLY IN DEMO MODE            
-
+CBR_CE::PerformRequestOptimization()
+{
     /* Receive Set of Observables */
-    LOG("\nCognitive Engine:: Receiving service name\n");
+    LOG("\nCognitive Engine:: Receiving Observables\n");
 
     char buffer[256];
-    memset(buffer, 0, 256);
-    ReadMessage(commandSocketFD,buffer);
-    LOG("\nCognitive Engine:: Got service name, %s\n", buffer);
-
-    /* Receive Set of Observables */
-    LOG("\nCognitive Engine:: Receiving Observable Parameters\n");
-
     memset(buffer, 0, 256);
     ReadMessage(commandSocketFD,buffer);
@@ -387 +350 @@
         ReadMessage(commandSocketFD, buffer);
         cp[i].value = atof(buffer);
-    }  
-    LOG("Cognitive Engine:: Processing parameters....\n");
-
-    //Parameter *solutionSet;
-    
-    //solutionSet = GetSolution(o,cp);
-
-    // TODO need to actually do something with the observables here
-   
-    LOG("Cognitive Engine:: Sending Optimal Parameters to Application.\n");
-    char numParametersChar[10];
-    //char solutionValue[50];
-    sprintf(numParametersChar, "%i", radioInfo->numParameters);
-    SendMessage(commandSocketFD, numParametersChar);
-    for(size_t i = 0; i < radioInfo->numParameters; i++) {
-        // TODO What's with all the commented-out code?
-        //SendMessage(commandSocketFD, solutionSet[i].name.c_str());
-        SendMessage(commandSocketFD, "test");
-        //memset(solutionValue, 0, 50);
-        //sprintf(solutionValue, "%f", solutionSet[i].value);
-        //SendMessage(commandSocketFD, solutionValue);
-        SendMessage(commandSocketFD, "00");
-    }
-
-    delete [] o;
-    delete [] cp;
-
-}
-
-
-void
-CBR_CE::PerformRequestOptimization()
-{
-    /* Receive Set of Observables */
-    LOG("\nCognitive Engine:: Receiving Observable Parameters\n");
-
-    char buffer[256];
-    memset(buffer, 0, 256);
-    ReadMessage(commandSocketFD,buffer);
-    uint32_t numObservables = atoi(buffer);
-
-    Observable *o = new Observable[numObservables];
-
-    for(size_t i = 0; i < numObservables; i++) {
-        memset(buffer, 0, 256);
-        ReadMessage(commandSocketFD, buffer);
-        o[i].name = std::string(buffer);
-
-        memset(buffer, 0, 256);
-        ReadMessage(commandSocketFD, buffer);
-        o[i].value = atof(buffer);
-    }  
-
-    /* Receive Set of current Parameters */
-    LOG("Cognitive Engine:: Receiving Current Transmission Parameters\n");
+    }
+
+    /* Receive Set of Utilities */
+    LOG("Cognitive Engine:: Receiving Utilities\n");
 
     memset(buffer, 0, 256);
     ReadMessage(commandSocketFD, buffer);
-    uint32_t numCurrentParameters = atoi(buffer);
-
-    Parameter *cp = new Parameter[numCurrentParameters];
-
-    for(size_t i = 0; i < numCurrentParameters; i++) {
-        memset(buffer, 0, 256);
-        ReadMessage(commandSocketFD, buffer);
-        cp[i].name = std::string(buffer);
-
-        memset(buffer, 0, 256);
-        ReadMessage(commandSocketFD, buffer);
-        cp[i].value = atof(buffer);
-    }  
+    uint32_t numUtilities = atoi(buffer);
+
+    Utility *u = new Utility[numUtilities];
+
+    for(size_t i = 0; i < numUtilities; i++) {
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD, buffer);
+        u[i].name = std::string(buffer);
+
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD, buffer);
+        u[i].value = atof(buffer);
+    }
+
+
+
+  
     LOG("Cognitive Engine:: Processing parameters....\n");
 
     Parameter *solutionSet;
     
-    solutionSet = GetSolution(o,cp);
-
-    // TODO need to actually do something with the observables here
+    solutionSet = GetSolution(o,cp,u);
+
+ 
    
     LOG("Cognitive Engine:: Sending Optimal Parameters to Application.\n");
@@ -480 +396 @@
     delete [] o;
     delete [] cp;
-}
-
-
-void
-CBR_CE::PerformQueryComponentType()
-{
-    SendComponentType();
-}
-
-
-void
-CBR_CE::PerformConnectSML()
-{
-    /* This command implies that we are disconnecting from the shell and
-     * connecting to a SML component. */
-    char serverName[256];
-    char serverPort[256];
-
-    // TODO is this going to end up being too slow?
-    memset(serverName, 0, 256);
-    memset(serverPort, 0, 256);
-
-    ReadMessage(commandSocketFD, serverName);
-    ReadMessage(commandSocketFD, serverPort);
-
-    /* Only continue if we are currently connected to a shell. */
-    if(!SML_present) {
-        DeregisterComponent();
-
-        shutdown(commandSocketFD, 2);
-        close(commandSocketFD);
-
-        ConnectToRemoteComponent(serverName, serverPort, true);
-    }
-}
-
-
-void
-CBR_CE::PerformDisconnectSML()
-{
-    /* This command implies that we are disconnecting from the SML and
-     * connecting to a shell component. */
-    char serverName[256];
-    char serverPort[256];
-
-    // TODO is this going to end up being too slow?
-    memset(serverName, 0, 256);
-    memset(serverPort, 0, 256);
-
-    ReadMessage(commandSocketFD, serverName);
-    ReadMessage(commandSocketFD, serverPort);
-
-    /* We only want to do this if we are actually connected to an SML
-     * currently. */
-    if(SML_present) {
-        DeregisterServices();
-
-        shutdown(commandSocketFD, 2);
-        close(commandSocketFD);
-
-        ConnectToRemoteComponent(serverName, serverPort, false);
-    }
+    delete [] u;
 }
 

vtcross/branches/nikhil/crossmodel1/src/cognitive_engines/CBR_CE/CBR_CE.h

@@ -42 +42 @@
         /*! Default constructor. */
         CBR_CE() : CognitiveEngine(){};
-
         /*! Default destructor. */
         ~CBR_CE(){};
@@ -57 +56 @@
                 const int32_t numFields, const bool SML);
 
-        void RegisterServices();
-        void DeregisterServices();
-
         /*! \brief Request that the CE optimize a set of parameters. 
          *
@@ -66 +62 @@
          * and active. */
         Parameter *GetSolution(Observable *observables, \
-                Parameter *currentParameters);
-        Parameter *GetSolution(Observable *observables, \
-                Parameter *currentParameters, std::string service);
+                Parameter *currentParameters, Utility *utilities);
 
         /*! \brief Receive feedback from the radio 
@@ -80 +74 @@
          * more accurate performance statistics. 
          */
-        void ReceiveFeedback(Observable *observables,Parameter *parameters);
-        void ReceiveFeedback(Observable *observables, Parameter *parameters, \
-                std::string service);
-
+        void ReceiveFeedback(Observable *observables,Parameter *parameters, Utility *utilities);
 
         /*! \brief Initialize the CE and prepare it for operation. 
@@ -102 +93 @@
          */
         void PerformUpdatePerformance();
-        void PerformRequestOptimizationService();
         void PerformRequestOptimization();
-        void PerformQueryComponentType();
-        void PerformConnectSML();
-        void PerformDisconnectSML();
+
         void PerformResetEngineCognitive();
         void PerformShutdownEngineCognitive();
 
         CBR *myCBR;
+
 };
 

vtcross/branches/nikhil/crossmodel1/src/cognitive_engines/CognitiveEngine.cpp

@@ -25 +25 @@
 #include <cmath>
 #include <string>
+#include <iostream>
 
 #include "vtcross/cognitive_engine.h"
@@ -66 +67 @@
 
     ConnectToRemoteComponent(serverName, serverPort, SML);
-}
-
+
+}
 
 void
@@ -85 +86 @@
     SML_present = SML;
 
-    if(SML) {
-        LOG("Cognitive Engine connected to SML at %s.\n", serverName);
+
+// Considering only Shell to work in this project!!
+
+        LOG("Cognitive Engine connected to shell at %s.\n", serverName);
 
         RegisterComponent();
         ReceiveRadioConfiguration();
         ReceiveExperience();
-        RegisterServices();
-    }
-    else {
-        LOG("Cognitive Engine connected to shell at %s.\n", serverName);
-
-        RegisterComponent();
-        ReceiveRadioConfiguration();
-        ReceiveExperience();
-    }
+
 }
 
@@ -108 +103 @@
     char buffer[256];
 
+    std::cout << "IN WAITFORSIGNAL METHOD" << std::endl;
+
     while(true) {
         memset(buffer, 0, 256);
@@ -114 +111 @@
 
         if(strcmp(buffer, "update_performance") == 0) {
-            PerformUpdatePerformance();
+            PerformUpdatePerformance();
         } 
-        else if(strcmp(buffer, "request_optimization_service") == 0) {
-            PerformRequestOptimizationService();
-        }
         else if(strcmp(buffer, "request_optimization") == 0) {
             PerformRequestOptimization();
         }
-        else if(strcmp(buffer, "query_component_type") == 0) {
-            PerformQueryComponentType();
-        }
-        else if(strcmp(buffer, "connect_sml") == 0) {
-            PerformConnectSML();
-        }
-        else if(strcmp(buffer, "disconnect_sml") == 0) {
-            PerformDisconnectSML();
-        }
         else if(strcmp(buffer, "reset_engine_cognitive") == 0) {
             PerformResetEngineCognitive();
@@ -144 +129 @@
 CognitiveEngine::Shutdown()
 {
-    if(SML_present) {
-        DeregisterServices();
         DeregisterComponent();
-    } 
-    else {
+    // TODO Need to actually kill this process...
+}
+
+
+void
+CognitiveEngine::Reset()
+{
+    LOG("Resetting Cognitive Engine.\n");
+
         DeregisterComponent();
-    }
-    // TODO Need to actually kill this process...
-}
-
-
-void
-CognitiveEngine::Reset()
-{
-    LOG("Resetting Cognitive Engine.\n");
-
-    if(SML_present) {
-        DeregisterServices();
-        DeregisterComponent();
-    } 
-    else {
-        DeregisterComponent();
-    }
 
     // TODO This function then needs to re-call "ConnectToRemoteComponent" to
@@ -325 +298 @@
 
     LOG("Cognitive Engine:: Waiting for %i number of entries.\n", numberExp);
- 
     SendMessage(commandSocketFD, "receive_exp_ack");
+
 }
 
@@ -338 +311 @@
 
 Parameter* 
-CognitiveEngine::GetSolution(Observable *observables, Parameter *currentParameters)
+CognitiveEngine::GetSolution(Observable *observables, Parameter *currentParameters, Utility *utilities)
 {
     LOG("Cognitive Engine:: Generating solution.\n");
@@ -348 +321 @@
 
 
-Parameter* 
-CognitiveEngine::GetSolution(Observable *observables, \
-        Parameter *currentParameters, std::string service)
-{
-    LOG("Cognitive Engine:: Generating solution for %s service.\n", service.c_str());
-
-    LOG("CognitiveEngine:: GetSolution with service not implemented.\n");
-
-    return NULL;
-}
-
-
-void 
-CognitiveEngine::ReceiveFeedback(Observable *observables,Parameter *parameters)
+void 
+CognitiveEngine::ReceiveFeedback(Observable *observables,Parameter *parameters, Utility *utilities)
 {
     LOG("Cognitive Engine:: Receiving feedback.\n");
@@ -369 +330 @@
 
 
-void 
-CognitiveEngine::ReceiveFeedback(Observable *observables, Parameter *parameters, \
-    std::string service)
-{
-    LOG("Cognitive Engine:: Receiving feedback.\n");
-
-    LOG("CognitiveEngine:: ReceiveFeedback not implemented.\n");
-}
-
-
 void
 CognitiveEngine::BuildCognitiveEngine()
@@ -387 +338 @@
 
 void 
-CognitiveEngine::RegisterServices()
-{
-    LOG("Cognitive Engine:: RegisterServices not implemented.\n");
-}
-
-
-void 
-CognitiveEngine::DeregisterServices()
-{
-    LOG("Cognitive Engine:: DeregisterServices not implemented.\n");
-}
-
-
-void 
 CognitiveEngine::PerformUpdatePerformance()
 {
@@ -407 +344 @@
 
 void
-CognitiveEngine::PerformRequestOptimizationService()
-{
-}
-
-
-void
 CognitiveEngine::PerformRequestOptimization()
 {
@@ -419 +350 @@
 
 void
-CognitiveEngine::PerformQueryComponentType()
-{
-}
-
-
-void
-CognitiveEngine::PerformConnectSML()
-{
-}
-
-
-void
-CognitiveEngine::PerformDisconnectSML()
-{
-}
-
-
-void
 CognitiveEngine::PerformResetEngineCognitive()
 {

vtcross/branches/nikhil/crossmodel1/src/include/vtcross/cognitive_engine.h

@@ -74 +74 @@
         virtual void DeregisterComponent();
 
-        virtual void RegisterServices();
-        virtual void DeregisterServices();
-
         /*! \brief Receive radio XML configuration.
          * 
@@ -97 +94 @@
          * and active. */
         virtual Parameter *GetSolution(Observable *observables, \
-                Parameter *currentParameters);
-        virtual Parameter *GetSolution(Observable *observables, \
-                Parameter *currentParameters, std::string service);
+                Parameter *currentParameters, Utility *utilities);
+
 
         /*! \brief Receive feedback from the radio 
@@ -111 +107 @@
          * more accurate performance statistics. 
          */
-        virtual void ReceiveFeedback(Observable *observables,Parameter *parameters);
-        virtual void ReceiveFeedback(Observable *observables, Parameter *parameters, \
-                std::string service);
+        virtual void ReceiveFeedback(Observable *observables,Parameter *parameters, Utility *utilities);
 
 
@@ -133 +127 @@
          */
         virtual void PerformUpdatePerformance();
-        virtual void PerformRequestOptimizationService();
         virtual void PerformRequestOptimization();
-        virtual void PerformQueryComponentType();
-        virtual void PerformConnectSML();
-        virtual void PerformDisconnectSML();
         virtual void PerformResetEngineCognitive();
         virtual void PerformShutdownEngineCognitive();

vtcross/branches/nikhil/crossmodel1/src/include/vtcross/components.h

@@ -119 +119 @@
          * Register or deregister services that this engine provides with the
          * service management layer. */
-        virtual void RegisterServices() = 0;
-        virtual void DeregisterServices() = 0;
+//        virtual void RegisterServices() = 0;
+//        virtual void DeregisterServices() = 0;
 };
 

vtcross/branches/nikhil/crossmodel1/src/include/vtcross/cross_shell.h

@@ -93 +93 @@
         void RegisterCognitiveEngine(int32_t socketFD);
         void DeregisterCognitiveEngine(int32_t socketFD);
-        void RegisterPolicyEngine(int32_t socketFD);
-        void DeregisterPolicyEngine(int32_t socketFD);
-        void RegisterSML(int32_t socketFD);
-        void DeregisterSML(int32_t socketFD);
+
+
+
+
         
         /*! \brief Set the active mission.
@@ -104 +104 @@
          * This command is basically passed through the CRS to the SML.
          */
-        void SetActiveMission(int32_t socketFD);
+
 
         /* Handle a message that is received from a component.

vtcross/branches/nikhil/crossmodel1/src/include/vtcross/libvtcross.h

@@ -39 +39 @@
  * communicating with. Note that this can be a local or remote destination.
  */
+
 void SetCrossShellLocation(std::string hostname, std::string port);
 
+Parameter* GetOptimalParameters(Observable *radioObservables, uint32_t numObservables, Parameter *currentParameters, uint32_t numCurrentParameters, Utility *radioUtilities, uint32_t numUtilities);
 
-/*! \brief  Parses XML configuration file and uses it to configure the radio. 
- *
- * This function *must* be called when the radio first starts up, and may be
- * called at any point after that to reconfigure the radio.
- */
-bool ParseRadioConfiguration();
+bool UpdateParameterPerformance(Parameter *p, uint32_t numParameters, Observable *o, uint32_t numObservables, Utility *u, uint32_t numUtilities);
 
-
-/*! \brief Lists current radio configuration options loaded from the XML.
- *
- * TODO How are we listing these?  Are we simply returning them to stdout?
- * Logging them? Returning strings?  Need to figure this out...
- */
-void ListCurrentRadioConfiguration();
-
-
-/*! \brief View data from the current status of the radio. 
- *
- * This function allows client code to capture radio properties at any certain
- * instant.  Note, however, that these properties could be changing at very
- * rapid rates. There is no guarantee that the return results from these
- * functions will still be valid by the time the client code receives them.
- */
-Observable* GetRadioObservables();
-Parameter* GetRadioParameters();
-Utility* GetRadioUtilities();
-
-
-/*! \brief View components currently connected to the radio by id. 
- *
- * TODO Should there be another way to list components? If you have 10 cognitive
- * engines, how are you going to know which is which just by id?
- */
-uint32_t* GetConnectedCognitiveEngines();
-uint32_t* GetConnectedPolicyEngines();
-uint32_t* GetConnectedManagementServiceLayers();
-uint32_t* GetConnectedComponents();
-
-
-/*! \brief  Given a certain set of observables, ask the radio to find the 
- * optimum radio parameters and return them. 
- *
- * TODO I'm a little confused about this function... why would anyone need to
- * use this?  Shouldn't this be internal to the radio operation? 
- */
-Parameter* GetOptimalParameters(Observable *radioObservables, uint32_t numObservables, 
-                Parameter *currentParameters, uint32_t numCurrentParameters);
-
-
-/*! \brief  Update the radio regarding its performance.
- *
- * TODO
- */
-bool UpdateParameterPerformance(Parameter *p, uint32_t numParameters, Observable *o, \
-        uint32_t numObservables);
-
-/*! \brief Deactivate/Activate/Disconnect a component by id.
- */
-bool ActivateComponent(uint32_t id);
-bool DeactivateComponent(uint32_t id);
-bool DisconnectComponent(uint32_t id);
-
-/*! \brief Set the active mission of the CROSS radio.
- */
-uint32_t SetActiveMission(char * activeMission);
-
-/*! \brief Shut down the radio.
- *
- * This function will deactivate and disconnect all radio components before
- * finally shutting down the shell and stopping radio operations.
- */
-bool Shutdown();
-
-/*! \brief Return total number of currently recognized transmission parameters.
- */
-uint32_t GetNumParameters();
-uint32_t GetNumObservables();
-uint32_t GetNumUtilities();
-
+uint32_t GetNum(std::string);
 
 #endif

vtcross/branches/nikhil/crossmodel1/src/libvtcross/Makefile.am

@@ -18 +18 @@
 
 lib_LTLIBRARIES = libvtcross.la
-bin_PROGRAMS = libvtcross_demo libvtcross_demo_sml
+bin_PROGRAMS = libvtcross_demo 
 
 libvtcross_la_SOURCES = libvtcross.cpp
@@ -27 +27 @@
 libvtcross_demo_LDADD = $(CROSS_LA) 
 
-libvtcross_demo_sml_SOURCES = libvtcross_demo_sml.cpp
-libvtcross_demo_sml_LDADD = $(CROSS_LA)
-
 SUBDIRS = . swig

vtcross/branches/nikhil/crossmodel1/src/libvtcross/libvtcross.cpp

@@ -57 +57 @@
 // TODO the following three functions all do exactly the same thing.  Why not
 // simply combine them?
-uint32_t
-GetNumObservables()
-{
-    char buffer[256];
 
-    uint32_t socketfd = ConnectToShell();
-    SendMessage(socketfd, "get_number_observables");
-    
-    memset(buffer, 0, 256);
-    ReadMessage(socketfd, buffer);
-    uint32_t numObservables = atoi(buffer);
-    
-    return numObservables; 
-}
-
-uint32_t
-GetNumUtilities()
-{
-    char buffer[256];
-
-    uint32_t socketfd = ConnectToShell();
-    SendMessage(socketfd, "get_number_utilities");
-    
-    memset(buffer, 0, 256);
-    ReadMessage(socketfd, buffer);
-    uint32_t numUtilities = atoi(buffer);
-    
-    return numUtilities; 
-}
-
-uint32_t
-SetActiveMission(char * activeMission)
-{
-    char buffer[256];
-    
-    uint32_t socketfd = ConnectToShell();
-    SendMessage(socketfd, "set_active_mission");
-
-    SendMessage(socketfd, activeMission);
-
-    //memset(buffer, 0, 256);
-    //ReadMessage(socketfd, buffer);
-
-    return 1;
-}
-
-uint32_t
-GetNumParameters()
-{
-    char buffer[256];
-
-    uint32_t socketfd = ConnectToShell();
-    SendMessage(socketfd, "get_number_parameters");
-    
-    memset(buffer, 0, 256);
-    ReadMessage(socketfd, buffer);
-    uint32_t numParameters = atoi(buffer);
-    
-    return numParameters; 
-}
-// end previous TODO
-
-/* Given a certain set of observables, ask the radio to find the optimum radio
- * parameters and return them. 
- *
- * TODO I'm a little confused about this function... why would anyone need to
- * use this?  Shouldn't this be internal to the radio operation? 
- *
- * TODO this function is returning a pointer to allocated memory, which is fine,
- * but we need to document this and make sure the caller is deallocating the
- * memory when it is done using it.
- */
 Parameter* 
-GetOptimalParameters(Observable *radioObservables, uint32_t numObservables,
-        Parameter *currentParameters, uint32_t numCurrentParameters)
+GetOptimalParameters(Observable *radioObservables, uint32_t numObservables, Parameter *currentParameters, uint32_t numCurrentParameters, Utility *radioUtilities, uint32_t numUtilities)
 {
     char var[50];
@@ -163 +91 @@
     }
 
+    /* Send Utilities */
+    memset(counter, 0, 55);
+    sprintf(counter, "%i", numUtilities);
+    SendMessage(socketFD, counter);
+    for(size_t i = 0; i < numUtilities; i++) {
+        SendMessage(socketFD,radioUtilities[i].name.c_str());
+        sprintf(var,"%f",radioUtilities[i].value);
+        SendMessage(socketFD,var);
+    }
+        
+
     /* Receive Set of Parameters */
     memset(buffer, 0, 256);
@@ -184 +123 @@
 
 bool
-UpdateParameterPerformance(Parameter *p, uint32_t numParameters, Observable *o,
-        uint32_t numObservables)
+UpdateParameterPerformance(Parameter *p, uint32_t numParameters, Observable *o, uint32_t numObservables, Utility *u, uint32_t numUtilities)
 {
     char counter[55];
@@ -205 +143 @@
     
     // Send Observables
+    memset(counter, 0, 55);
     sprintf(counter, "%i", numObservables);
     SendMessage(socketFD, counter);
@@ -212 +151 @@
         SendMessage(socketFD, var);    
     }
+
+    // Send Utilities
+    memset(counter, 0, 55);
+    sprintf(counter, "%i", numUtilities);
+    SendMessage(socketFD, counter);
+    for(size_t i = 0; i < numUtilities; i++) {
+        SendMessage(socketFD, u[i].name.c_str());
+        sprintf(var, "%f", u[i].value);
+        SendMessage(socketFD, var);
+    }
+        
 }
 
-bool ActivateComponent(uint32_t id) {
-    return 1;
-}
-bool DeactivateComponent(uint32_t id) {
-    return 1;
-} 
-bool DisconnectComponent(uint32_t id) {
-    return 1;
-}
+uint32_t GetNum(string type)
+{
+
+        char buffer[256];
+        uint32_t socketfd = ConnectToShell();
+        
+        if (type == "parameters")
+                SendMessage(socketfd, "get_number_parameters");
+        else if (type == "utilities")
+                SendMessage(socketfd, "get_number_utilities");
+        else if (type == "observables")
+                SendMessage(socketfd, "get_number_observables");        
+        else
+                LOG("Type not included, either 'parameters' or 'utilities' or 'observables'");  
+
+        memset(buffer, 0, 256);
+        ReadMessage(socketfd, buffer);
+        uint32_t number = atoi(buffer);
+        return number;
 
 
-/* View components currently connected to the radio by id. 
- *
- * TODO Should there be another way to list components? If you have 10 cognitive
- * engines, how are you going to know which is which just by id?
- */
-uint32_t* GetConnectedCognitiveEngines() {
 }
-uint32_t* GetConnectedPolicyEngines(){
-}
-uint32_t* GetConnectedManagementServiceLayers(){
-}
-uint32_t* GetConnectedComponents(){
-}
-
-
-/* View data from the current status of the radio. 
- *
- * This function allows client code to capture radio properties at any certain
- * instant.  Note, however, that these properties could be changing at very
- * rapid rates. There is no guarantee that the return results from these
- * functions will still be valid by the time the client code receives them.
- */
-Observable* GetRadioObservables() {
-}
-Parameter* GetRadioParameters(){
-}
-Utility* GetRadioUtilities(){
-}
-
-
-/* Parses VTCROSS XML configuration file and uses it to configure the radio. 
- *
- * This function *must* be called when the radio first starts up, and may be
- * called at any point after that to reconfigure the radio.
- */
-bool ParseRadioConfiguration(){
-}
-
-
-/* Lists current radio configuration options loaded from the configuration XML
- * file. 
- *
- * TODO How are we listing these?  Are we simply returning them to stdout?
- * Logging them? Returning strings?  Need to figure this out...
- */
-void ListCurrentRadioConfiguration(){
-}
-
-/* Shut down the radio.
- *
- * This function will deactivate and disconnect all radio components before
- * finally shutting down the shell and stopping radio operations.
- */
-bool Shutdown(){
-}
-

vtcross/branches/nikhil/crossmodel1/src/libvtcross/libvtcross_demo.cpp

@@ -24 +24 @@
 #include "vtcross/libvtcross.h"
 #include "vtcross/socketcomm.h"
+#include <iostream>
 
 int32_t 
@@ -31 +32 @@
     SetCrossShellLocation("localhost", "40000");
 
-    for(size_t i = 0; i < 10; i++) {
-        Observable *o = new Observable[2];
-        Parameter *currentParameters = new Parameter[2];
+
+// need to include utilties also in system,.. 
+
+        Observable *o = new Observable[10];
+        Parameter *currentParameters = new Parameter[10];
+        Utility *u = new Utility[10];
         Parameter *p;
 
@@ -40 +44 @@
         uint32_t numUtilities;
 
-        o[0].name = "throughput";
-        o[0].value = 150.00;
-        o[1].name = "PER";
-        o[1].value = 12.00;
+        u[0].name = "throughput";
+//        u[0].value = 15
+        u[1].name = "PER";
+//        u[1].value = 12.00;
+
+        numParameters = GetNum("parameters");
+        numObservables = GetNum("observables");
+        numUtilities = GetNum("utilities");
+
+
+// This is for loop for performing 10 cycles of updates.. with CBR
+    for(size_t i = 0; i < 10; i++) {
 
         if(i == 0) {
             currentParameters[0].name = "bandwidth";
-            currentParameters[0].value = 300.0;
+            currentParameters[0].value = 200.0;
             currentParameters[1].name = "tx_power";
             currentParameters[1].value = 10.0;
@@ -57 +69 @@
         LOG("Application:: Requesting parameter optimization.\n");
 
-        p = GetOptimalParameters(o,2,currentParameters,2);
-        numParameters = GetNumParameters();
-        numObservables = GetNumObservables();
-        numUtilities = GetNumUtilities();
+        p = GetOptimalParameters(o,0,currentParameters,2,u,2);
 
         LOG("Application:: Received the following parameters.\n");
@@ -68 +77 @@
         }
 
-        /* Try them out! Do they work? */
-        o[0].value = 0.5*p[0].value + .1*p[1].value;
-        o[1].value = 15-p[1].value;
+///        Try them out! Do they work? 
+        u[0].value = 2*p[0].value + 1*p[1].value + ((rand()*2.0/RAND_MAX - 1)*10.0);
+        u[1].value = 12-p[0].value/50 - p[1].value/3 + ((rand()*2.0/RAND_MAX - 1.0)*0.1);
 
-        UpdateParameterPerformance(p, numParameters, o, numObservables);    
-        
-        delete [] p; 
-        delete [] o; 
+        if (u[1].value < 0) 
+                u[1].value = 0; 
+
+        LOG("utilities\n %s : %f \n %s : %f \n",u[0].name.c_str(),u[0].value,u[1].name.c_str(),u[1].value);     
+
+        UpdateParameterPerformance(p, numParameters, o, numObservables, u, numUtilities);    
+
+        usleep(1000);        
+ 
     }
 

vtcross/branches/nikhil/crossmodel1/src/shell/CognitiveRadioShell.cpp

@@ -183 +183 @@
         }
     }
+
     
     /* Receive ACK for radio configuration */
@@ -215 +216 @@
         return false;
     }
+
     return true;
 }
@@ -252 +254 @@
 }
 
-
-void
-CognitiveRadioShell::RegisterPolicyEngine(int32_t socketFD)
-{
-    LOG("Cognitive Radio Shell:: Received registration from Policy Engine on socket %d.\n", \
-            socketFD);
-
-    PE_present = true;
-}
-
-
-void 
-CognitiveRadioShell::DeregisterPolicyEngine(int32_t socketFD)
-{
-    LOG("Cognitive Radio Shell:: Received deregistration message from Policy Engine.\n");
-
-    PE_present = false;
-    
-    SendMessage(socketFD, "deregister_ack");
-    shutdown(socketFD, 2);
-    close(socketFD);
-    LOG("Cognitive Radio Shell:: Socket %d closed.\n", socketFD);
-}
-
-
-void
-CognitiveRadioShell::RegisterSML(int32_t socketFD)
-{
-    LOG("Cognitive Radio Shell:: Received registration from SML on socket %d.\n", \
-            socketFD);
-
-    SML_present = true;
-}
-
-
-void 
-CognitiveRadioShell::DeregisterSML(int32_t socketFD)
-{
-    LOG("Cognitive Radio Shell:: Received deregistration message from SML.\n");
-
-    SML_present = false;
-
-    SendMessage(socketFD, "deregister_ack");
-    shutdown(socketFD, 2);
-    close(socketFD);
-    LOG("Cognitive Radio Shell:: Socket %d closed.\n", socketFD);
-}
-
-void 
-CognitiveRadioShell::SetActiveMission(int32_t socketFD)
-{
-    char buffer[256];
-
-    LOG("Cognitive Radio Shell:: Received Set Active Mission command from host.\n");
-   
-    /* Read the name of the active mission to be set from the host. */
-    memset(buffer, 0, 256);
-    ReadMessage(commandSocketFD, buffer);
-
-    /* Send command to SML. */
-    SendMessage(ceSocketFD, "set_active_mission");
-    SendMessage(ceSocketFD, buffer);
-
-    /* Get ack from SML saying the mission was set properly */
-    memset(buffer, 0, 256);
-    ReadMessage(ceSocketFD, buffer);
-
-    /* Forward ack to host */
-    SendMessage(commandSocketFD, buffer);
-}
 
 void 
@@ -415 +347 @@
             }
 
-            if(!match_found) { 
-                ERROR(1, "Error: %s: %s is not a valid utility.\n", \
-                    oList[item_count].name.c_str(), oUtilName);
-            }
-            else
-                match_found = false;    
+  
+//////////////////WE are not looking for relationship between them..            
+//            if(!match_found) { 
+//                ERROR(1, "Error: %s: %s is not a valid utility.\n", \
+//                    oList[item_count].name.c_str(), oUtilName);
+//            }
+//            else
+//                match_found = false;    
         }
         oList[item_count].numAffects = affect_count; 
@@ -476 +410 @@
             }
 
-            if(!match_found) {
-                ERROR(1, "Error: %s: %s is not a valid utility.\n", \
-                    pList[item_count].name.c_str(), pUtilName);
-            }
-
-            match_found = false;    
+//            if(!match_found) {
+//                ERROR(1, "Error: %s: %s is not a valid utility.\n", \
+//                    pList[item_count].name.c_str(), pUtilName);
+//            }
+
+//            match_found = false;    
         }
 
@@ -536 +470 @@
         cp[i].value = atof(buffer);
     }
+////////////// NEW    INCLUSION ///////////////////
+
+/* Receive Set of Utilities */
+    memset(buffer, 0, 256);
+    ReadMessage(commandSocketFD,buffer);
+    uint32_t numUtilities = atoi(buffer);
+
+    LOG("Cognitive Radio Shell:: Attempting to get %i utilities.\n",numUtilities);
+    Utility *u = new Utility[numUtilities];
+
+    for (size_t i = 0;i < numUtilities; i++){
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD,buffer);
+        u[i].name = std::string(buffer);
+
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD,buffer);
+        u[i].value = atof(buffer);
+    }
+
+///////////////////////////////////////
 
     /* Send to Cognitive Engine 
@@ -541 +496 @@
      * to send this information
      */
+    SendMessage(ceSocketFD,"request_optimization");
+
     LOG("Cognitive Radio Shell:: Passing on observables.\n");
-    SendMessage(ceSocketFD,"request_optimization");
     sprintf(counter,"%i",numObservables);
     SendMessage(ceSocketFD,counter);
@@ -559 +515 @@
         SendMessage(ceSocketFD,var); 
     }
+
+/////////////  NEW  ////////////////////////////////////////////////////////
+    LOG("Cognitive Radio Shell:: Passing on utilities.\n");
+    sprintf(counter,"%i",numUtilities);
+    SendMessage(ceSocketFD,counter);
+    for(size_t i = 0; i < numUtilities; i++) {
+        SendMessage(ceSocketFD,u[i].name.c_str());
+        sprintf(var,"%f",u[i].value);
+        SendMessage(ceSocketFD,var);
+    }
+
+////////////// END of NEW /////////////////////////////////////
 
     /* Receive Set of Parameters */
@@ -591 +559 @@
 
     delete [] o;
+    delete [] u;
     delete [] p;
 }
@@ -634 +603 @@
         ReadMessage(commandSocketFD, buffer);
         o[i].value = atof(buffer);
+    }
+
+    /* Receive Set of Utilities */
+    memset(buffer, 0, 256);
+    ReadMessage(commandSocketFD, buffer);
+    uint32_t numUtilities = atoi(buffer);
+
+    Utility *u = new Utility[numUtilities];
+
+    for(size_t i = 0; i < numUtilities; i++) {
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD, buffer);
+        u[i].name = std::string(buffer);
+
+        memset(buffer, 0, 256);
+        ReadMessage(commandSocketFD, buffer);
+        u[i].value = atof(buffer);
     }
 
@@ -650 +636 @@
     
     /* Send Observables */
+    memset(counter, 0, 55);
     sprintf(counter, "%i", numObservables);
     SendMessage(ceSocketFD, counter);
@@ -658 +645 @@
     }   
 
+     /* Send Utilities */
+     memset(counter, 0, 55);
+     sprintf(counter, "%i", numUtilities);
+     SendMessage(ceSocketFD,counter);
+     for(size_t i = 0; i < numUtilities; i++) {
+        SendMessage(ceSocketFD, u[i].name.c_str());
+        sprintf(var, "%f", u[i].value);
+        SendMessage(ceSocketFD, var);
+     }
+
+
     delete [] p;
     delete [] o;
+    delete [] u;
 }
 
@@ -678 +677 @@
     } else if(strcmp(buffer, "deregister_engine_cognitive") == 0) {
         DeregisterCognitiveEngine(socketFD);
-    } else if(strcmp(buffer, "register_engine_policy") == 0) {
-        RegisterPolicyEngine(socketFD);
-    } else if(strcmp(buffer, "deregister_engine_policy") == 0) {
-        DeregisterPolicyEngine(socketFD);
-    } else if(strcmp(buffer, "register_sml") == 0) {
-        RegisterSML(socketFD);
-    } else if(strcmp(buffer, "deregister_sml") == 0) {
-        DeregisterSML(socketFD);
     } else if(strcmp(buffer, "update_performance") == 0) {
         UpdateParameterPerformance(socketFD);
@@ -703 +694 @@
         /* Receive optimization request and current environment */
         GetOptimalParameters(socketFD);  
-    } else if(strcmp(buffer, "set_active_mission") == 0) {
-        SetActiveMission(socketFD);  
-    } else if(strcmp(buffer, "request_optimization_service") == 0) {
-        /* Receive optimization request and current environment */
-        //GetOptimalParametersService(socketFD);  
-    }
+    } 
 
     return ret;

vtcross/branches/nikhil/crossmodel1/src/shell/configs/demo.xml

@@ -8 +8 @@
     <!-- utilities : QoS metrics -->
     <utilities>
-        <utility name="tp" units="kbps" goal="max" target="125000" /> 
-        <utility name="packet_error" units="none" goal="min" target="1" />
+        <utility name="throughput" units="kbps" goal="max" target="517" /> 
+        <utility name="PER" units="none" goal="min" target="1.2" />
     </utilities>
 
     <!-- radio parameters -->
     <parameters>
-        <parameter name="bandwidth" units="hz" min="1" max="255" step="1">
-            <affect utility="tp" relationship="improve" />
+        <parameter name="bandwidth" units="hz" min="1" max="255" step="10">
         </parameter>
         <parameter name="tx_power" units="dBm" min="1" max="255" step="1">
-            <affect utility="packet_error" relationship="improve"/>
         </parameter>
     </parameters>
@@ -24 +22 @@
     <!-- link/channel observations -->
     <observables>
-        <observable name="throughput">
-            <affect utility="tp" relationship="improve" />
-        </observable>
-        <observable name="PER">
-            <affect utility="packet_error" relationship="improve" />
-        </observable>
     </observables>
 </engine>