channel complete

이준영
Commit dae5dd0407c09f2d5d4fc88162aaecdf960bcd49 dae5dd04 2 parents 76f955f2 54d71c4a
Showing 1 changed file with 4 additions and 0 deletions
constellation/constellation/channel.h
--- a/constellation/constellation/channel.h
View file @dae5dd0
+++ b/constellation/constellation/channel.h
View file @dae5dd0
@@ -16,7 +16,11 @@ public:
 Cchannel::Cchannel()
 {
 	default_random_engine generator;
+ <<<<<<< HEAD
 	normal_distribution<double> myGauss(0, No/2);
+ =======
+ 	normal_distribution<double> myGauss(0, No / 2);
+ >>>>>>> ljy
 	for (int i = 0; i < Nbits; i++)
 		noise[i] = myGauss(generator);
 }