Changeset 86

Timestamp:

11/25/08 14:31:00 (16 years ago)

Author:

trnewman

Message:

fixed some error handling issues

Location:

vtcross/branches/trnewman/CR_shell

Files:

• example.ce.xml (modified) (1 diff)
• src/main_cognitive_radio.cpp (modified) (3 diffs)

vtcross/branches/trnewman/CR_shell/example.ce.xml

@@ -8 +8 @@
     <!-- utilities : QoS metrics -->
     <utilities>
-        <utility name="throughput" units="kbps" goal="max" target="125000" />
+        <utility name="throughput" units="kbps" goal="max" target="125000" /> 
         <utility name="spectral_efficiency" units="b/s/Hz" goal="max" />
-        <utility name="log10_ber" units="none" goal="min" target="-3" />
+        <!-- <utility name="log10_ber" units="none" goal="min" target="-3" /> -->
         <!-- <utility name="latency" units="ms" goal="min" target=100 /> -->
     </utilities>

vtcross/branches/trnewman/CR_shell/src/main_cognitive_radio.cpp

@@ -90 +90 @@
         int j = 0;
         int k = 0;
+        int match_found = 0;
 
         pElem = hDoc.FirstChildElement().Element();
@@ -137 +138 @@
                         if(oUtilName) {
                                 // Search for correct utility
-                                for(k=0;k<10;k++){
+                                for( k=0 ; u[k]!=NULL ; k++ ){
                                         if(u[k]->name == oUtilName) {
                                                 o[i]->affection_list[j].u = u[k];
+                                                // Set relationship
+                                                const char *oRelate = pSecondChild->Attribute("relationship");
+                                                if(oRelate) o[i]->affection_list[j].relation = oRelate;
+                                                j++;
+                                                match_found = 1;
                                                 break;
                                         }
                                 }
                         }
-                        
-                        // Set relationship
-                        const char *oRelate = pSecondChild->Attribute("relationship");
-                        if(oRelate) o[i]->affection_list[j].relation = oRelate;
-                        j++;
+                        if(!match_found) cout << "Error: " << o[i]->name << ": " << oUtilName << " not a valid utility: Affect not added." << endl;     
+                        match_found = 0;        
                 }
                 o[i]->numAffects = j; 
@@ -185 +188 @@
                                 for( k=0 ; u[k]!=NULL ; k++ ){
                                         if(u[k]->name == pUtilName) {
+                                                // If match found, assign it to this index
                                                 p[i]->affection_list[j].u = u[k];       
+                                                const char *pRelate = pSecondChild->Attribute("relationship");
+                                                if(pRelate) {
+                                                        p[i]->affection_list[j].relation = pRelate;
+                                                } else {
+                                                        cout << "Error: No relation found." << endl;
+                                                }
+                                                match_found = 1;
+                                                j++;
                                                 break;
                                         }
                                 }
                         }
-                        
-                        // Set relationship
-                        const char *pRelate = pSecondChild->Attribute("relationship");
-                        if(pRelate) {
-                                p[i]->affection_list[j].relation = pRelate;
-                        } else {
-                                cout << "Error: No relation found." << endl;
-                        }
-                        j++;
-                
+                        if(!match_found) cout << "Error: " << p[i]->name << ": " << pUtilName << " not a valid utility: Affect not added." << endl;     
+                        match_found = 0;        
                 }
                 p[i]->numAffects = j;