Show
Ignore:
Timestamp:
04/07/09 10:19:43 (15 years ago)
Author:
bhilburn
Message:

Changed more \t over to spaces. Please check your vimrcs!!!

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • vtcross/trunk/src/shell/CognitiveRadioShell.cpp

    r231 r232  
    157157    for(size_t i = 0; i < radio_info->numObservables; i++) { 
    158158        SendMessage(socketFD, observables[i].name.c_str()); 
    159                  
     159         
    160160        sprintf(counter, "%i", observables[i].numAffects);  
    161161        SendMessage(socketFD, counter); 
     
    165165        } 
    166166    } 
    167          
     167     
    168168    /* Receive ACK for radio configuration */ 
    169169    char buffer[256]; 
     
    185185    LOG("Cognitive Radio Shell:: Sending radio experience to Cognitive Engine.\n"); 
    186186    int32_t numberExp = 4; 
    187         char numberExpString[50]; 
     187    char numberExpString[50]; 
    188188 
    189189    sprintf(numberExpString, "%i", numberExp); 
     
    462462    uint32_t numObservables = atoi(buffer); 
    463463   
    464         LOG("Cognitive Radio Shell:: Attempting to get %i observables.\n", numObservables); 
     464    LOG("Cognitive Radio Shell:: Attempting to get %i observables.\n", numObservables); 
    465465    Observable *o = new Observable[numObservables]; 
    466466  
     
    475475    } 
    476476 
    477         /* Receive Set of Current Parameters */ 
     477    /* Receive Set of Current Parameters */ 
    478478    memset(buffer, 0, 256); 
    479479    ReadMessage(commandSocketFD,buffer); 
    480480    uint32_t numCurrentParameters = atoi(buffer); 
    481481   
    482         LOG("Cognitive Radio Shell:: Attempting to get %i parameters.\n",numCurrentParameters); 
     482    LOG("Cognitive Radio Shell:: Attempting to get %i parameters.\n",numCurrentParameters); 
    483483    Parameter * cp = new Parameter[numCurrentParameters]; 
    484484 
     
    493493 
    494494    /* Send to Cognitive Engine  
    495         * TODO: With multiple CEs we need to make a decision about where 
    496         * to send this information 
    497         */ 
    498         if(!SML_present) {  
    499             LOG("Cognitive Radio Shell:: Passing on observables to Cognitive Engine\n"); 
     495    * TODO: With multiple CEs we need to make a decision about where 
     496    * to send this information 
     497    */ 
     498    if(!SML_present) {  
     499        LOG("Cognitive Radio Shell:: Passing on observables to Cognitive Engine\n"); 
    500500        SendMessage(ceSocketFD,"request_optimization"); 
    501501        sprintf(counter,"%i",numObservables); 
     
    504504            SendMessage(ceSocketFD,o[i].name.c_str()); 
    505505            sprintf(var,"%f",o[i].value); 
    506                 SendMessage(ceSocketFD,var); 
     506            SendMessage(ceSocketFD,var); 
    507507        } 
    508              
    509                 LOG("Cognitive Radio Shell:: Passing on current parameters to Cognitive Engine\n"); 
     508         
     509        LOG("Cognitive Radio Shell:: Passing on current parameters to Cognitive Engine\n"); 
    510510        sprintf(counter,"%i",numCurrentParameters); 
    511511        SendMessage(ceSocketFD,counter); 
     
    513513            SendMessage(ceSocketFD,cp[i].name.c_str()); 
    514514            sprintf(var,"%f",cp[i].value); 
    515                 SendMessage(ceSocketFD,var); 
     515            SendMessage(ceSocketFD,var); 
    516516        } 
    517         } 
    518  
    519         LOG("Cognitive Radio Shell:: Receiving optimized parameters from Cognitive Engine.\n"); 
     517    } 
     518 
     519    LOG("Cognitive Radio Shell:: Receiving optimized parameters from Cognitive Engine.\n"); 
    520520    /* Receive Set of Parameters */ 
    521521    memset(buffer, 0, 256); 
     
    536536 
    537537    /* Send to Application  
    538         */ 
    539         LOG("Cognitive Radio Shell:: Sending optimized parameters to Application.\n"); 
     538    */ 
     539    LOG("Cognitive Radio Shell:: Sending optimized parameters to Application.\n"); 
    540540    memset(counter, 0, 55); 
    541541    sprintf(counter, "%i", numParameters); 
     
    544544        SendMessage(commandSocketFD, p[i].name.c_str()); 
    545545        sprintf(var, "%f", p[i].value); 
    546             SendMessage(commandSocketFD, var); 
     546        SendMessage(commandSocketFD, var); 
    547547    } 
    548548 
     
    559559    char buffer[256]; 
    560560 
    561         /* Receive Set of Parameters */ 
     561    /* Receive Set of Parameters */ 
    562562    memset(buffer, 0, 256); 
    563563    ReadMessage(commandSocketFD,buffer); 
     
    644644        UpdateParameterPerformance(socketFD); 
    645645    } else if(strcmp(buffer, "get_number_utilities") == 0) { 
    646                 char numUtilities[20]; 
    647                 sprintf(numUtilities, "%i", radio_info->numUtilities); 
     646        char numUtilities[20]; 
     647        sprintf(numUtilities, "%i", radio_info->numUtilities); 
    648648        SendMessage(commandSocketFD, numUtilities); 
    649649    } else if(strcmp(buffer, "get_number_observables") == 0) { 
    650                 char numObservables[20]; 
    651                 sprintf(numObservables, "%i", radio_info->numObservables); 
     650        char numObservables[20]; 
     651        sprintf(numObservables, "%i", radio_info->numObservables); 
    652652        SendMessage(commandSocketFD, numObservables); 
    653653    } else if(strcmp(buffer, "get_number_parameters") == 0) { 
    654                 char numParameters[20]; 
    655                 sprintf(numParameters, "%i", radio_info->numParameters); 
     654        char numParameters[20]; 
     655        sprintf(numParameters, "%i", radio_info->numParameters); 
    656656        SendMessage(commandSocketFD, numParameters); 
    657657    } else if(strcmp(buffer, "request_optimization") == 0) { 
     
    686686    int32_t maxDescriptor;  
    687687 
    688         if(servSock[primary] > servSock[policy]) 
    689                 maxDescriptor = servSock[primary]; 
     688    if(servSock[primary] > servSock[policy]) 
     689        maxDescriptor = servSock[primary]; 
    690690    else  
    691                 maxDescriptor = servSock[policy]; 
    692  
    693         if(servSock[command] > maxDescriptor) 
    694                 maxDescriptor = servSock[command]; 
     691        maxDescriptor = servSock[policy]; 
     692 
     693    if(servSock[command] > maxDescriptor) 
     694        maxDescriptor = servSock[command]; 
    695695 
    696696    if(InitializeTCPServerPort(servSock[primary]) == -1)