From 90095d540be2aa338429507c90c01a472ba49fd9 Mon Sep 17 00:00:00 2001
From: ericps1 <ericps1@vt.edu>
Date: Fri, 5 Feb 2016 22:42:05 -0500
Subject: [PATCH] Ran config_CEs after removing CE that was not in repo.

---
 makefile    |  2 +-
 src/ECR.cpp | 39 ++++++++++++++++++---------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/makefile b/makefile
index 425e6b7..a61a4e4 100644
--- a/makefile
+++ b/makefile
@@ -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
diff --git a/src/ECR.cpp b/src/ECR.cpp
index 73b4ef6..b9ae8ec 100644
--- a/src/ECR.cpp
+++ b/src/ECR.cpp
@@ -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
 
@@ -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
 }