Skip to content

Commit

Permalink
Ran config_CEs after removing CE that was not in repo.
Browse files Browse the repository at this point in the history
  • Loading branch information
ericps1 committed Feb 6, 2016
1 parent d9599e5 commit 90095d5
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 22 deletions.
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FLAGS = -I include -Wall -fPIC -std=c++11 -g
LIBS = lib/TUN.o lib/ECR.o -lliquid -luhd -lpthread -lm -lc -lconfig

#EDIT START FLAG
CEs = src/CE.cpp cognitive_engines/CE_Template.cpp cognitive_engines/CE_Subcarrier_Alloc.cpp cognitive_engines/CE_Mod_Adaptation.cpp cognitive_engines/CE_Two_Channel_DSA_Spectrum_Sensing.cpp cognitive_engines/CE_Two_Channel_DSA_PU.cpp cognitive_engines/CE_FEC_Adaptation.cpp cognitive_engines/CE_Two_Channel_DSA_Link_Reliability.cpp cognitive_engines/CE_Simultaneous_RX_And_Sensing.cpp cognitive_engines/CE_Network_Traffic_Gen_Test.cpp cognitive_engines/CE_Throughput_Test.cpp
CEs = src/CE.cpp cognitive_engines/CE_Template.cpp cognitive_engines/CE_Subcarrier_Alloc.cpp cognitive_engines/CE_Mod_Adaptation.cpp cognitive_engines/CE_Two_Channel_DSA_Spectrum_Sensing.cpp cognitive_engines/CE_Two_Channel_DSA_PU.cpp cognitive_engines/CE_FEC_Adaptation.cpp cognitive_engines/CE_Two_Channel_DSA_Link_Reliability.cpp cognitive_engines/CE_Simultaneous_RX_And_Sensing.cpp cognitive_engines/CE_Throughput_Test.cpp
#EDIT END FLAG

all: lib/TUN.o lib/read_configs.o config_CEs lib/ECR.o logs/logs2python logs/logs2octave CRTS_CR lib/interferer.o CRTS_interferer CRTS_controller
Expand Down
39 changes: 18 additions & 21 deletions src/ECR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "../cognitive_engines/CE_FEC_Adaptation.hpp"
#include "../cognitive_engines/CE_Two_Channel_DSA_Link_Reliability.hpp"
#include "../cognitive_engines/CE_Simultaneous_RX_And_Sensing.hpp"
#include "../cognitive_engines/CE_Network_Traffic_Gen_Test.hpp"
#include "../cognitive_engines/CE_Throughput_Test.hpp"
// EDIT INCLUDE END FLAG

Expand Down Expand Up @@ -316,26 +315,24 @@ ExtensibleCognitiveRadio::~ExtensibleCognitiveRadio() {
void ExtensibleCognitiveRadio::set_ce(char *ce) {
///@cond INTERNAL
// EDIT SET_CE START FLAG
if (!strcmp(ce, "CE_Template"))
CE = new CE_Template();
if (!strcmp(ce, "CE_Subcarrier_Alloc"))
CE = new CE_Subcarrier_Alloc();
if (!strcmp(ce, "CE_Mod_Adaptation"))
CE = new CE_Mod_Adaptation();
if (!strcmp(ce, "CE_Two_Channel_DSA_Spectrum_Sensing"))
CE = new CE_Two_Channel_DSA_Spectrum_Sensing();
if (!strcmp(ce, "CE_Two_Channel_DSA_PU"))
CE = new CE_Two_Channel_DSA_PU();
if (!strcmp(ce, "CE_FEC_Adaptation"))
CE = new CE_FEC_Adaptation();
if (!strcmp(ce, "CE_Two_Channel_DSA_Link_Reliability"))
CE = new CE_Two_Channel_DSA_Link_Reliability();
if (!strcmp(ce, "CE_Simultaneous_RX_And_Sensing"))
CE = new CE_Simultaneous_RX_And_Sensing();
if (!strcmp(ce, "CE_Network_Traffic_Gen_Test"))
CE = new CE_Network_Traffic_Gen_Test();
if (!strcmp(ce, "CE_Throughput_Test"))
CE = new CE_Throughput_Test();
if(!strcmp(ce, "CE_Template"))
CE = new CE_Template();
if(!strcmp(ce, "CE_Subcarrier_Alloc"))
CE = new CE_Subcarrier_Alloc();
if(!strcmp(ce, "CE_Mod_Adaptation"))
CE = new CE_Mod_Adaptation();
if(!strcmp(ce, "CE_Two_Channel_DSA_Spectrum_Sensing"))
CE = new CE_Two_Channel_DSA_Spectrum_Sensing();
if(!strcmp(ce, "CE_Two_Channel_DSA_PU"))
CE = new CE_Two_Channel_DSA_PU();
if(!strcmp(ce, "CE_FEC_Adaptation"))
CE = new CE_FEC_Adaptation();
if(!strcmp(ce, "CE_Two_Channel_DSA_Link_Reliability"))
CE = new CE_Two_Channel_DSA_Link_Reliability();
if(!strcmp(ce, "CE_Simultaneous_RX_And_Sensing"))
CE = new CE_Simultaneous_RX_And_Sensing();
if(!strcmp(ce, "CE_Throughput_Test"))
CE = new CE_Throughput_Test();
// EDIT SET_CE END FLAG
///@endcond
}
Expand Down

0 comments on commit 90095d5

Please sign in to comment.