2019-1-software-lab-1 / 0509_team1

Go to a project
Toggle navigation Toggle navigation pinning
이준영
dae5dd04 2 parents 76f955f2 54d71c4a

channel complete

Inline Side-by-side
Showing 1 changed file with 4 additions and 0 deletions
...@@ -16,7 +16,11 @@ public: ...@@ -16,7 +16,11 @@ public:
16 Cchannel::Cchannel() 16 Cchannel::Cchannel()
17 { 17 {
18 default_random_engine generator; 18 default_random_engine generator;
19 +<<<<<<< HEAD
19 normal_distribution<double> myGauss(0, No/2); 20 normal_distribution<double> myGauss(0, No/2);
21 +=======
22 + normal_distribution<double> myGauss(0, No / 2);
23 +>>>>>>> ljy
20 for (int i = 0; i < Nbits; i++) 24 for (int i = 0; i < Nbits; i++)
21 noise[i] = myGauss(generator); 25 noise[i] = myGauss(generator);
22 } 26 }
......