Merge pull request #411 from ICB-DCM/fixes_yannik

fix #408 questionmark operator
AMICI-dev · Aug 18, 2018 · a18f2a7 · a18f2a7
2 parents cbf4605 + f2e071f
commit a18f2a7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/edata.cpp b/src/edata.cpp
@@ -76,7 +76,7 @@ ExpData::ExpData(ReturnData const& rdata, std::vector<realtype> sigma_y, std::ve
 
     for (int iy = 0; iy < nytrue; ++iy) {
         for (int it = 0; it < nt(); ++it) {
-            sigma = sigma_y.at(iy) ? sigma_y.size() == (unsigned) nytrue : sigma_y.at(iy + nytrue * it);
+            sigma = sigma_y.size() == (unsigned) nytrue ? sigma_y.at(iy) : sigma_y.at(iy + nytrue * it);
             std::normal_distribution<> e{0, sigma};
             observedData.at(iy + nytrue * it) = rdata.y.at(iy + rdata.ny * it) + e(gen);
             observedDataStdDev.at(iy + nytrue * it) = sigma;
@@ -85,7 +85,7 @@ ExpData::ExpData(ReturnData const& rdata, std::vector<realtype> sigma_y, std::ve
 
     for (int iz = 0; iz < nztrue; ++iz) {
         for (int ie = 0; ie < nmaxevent; ++ie) {
-            sigma = sigma_z.at(iz) ? sigma_z.size() == (unsigned) nztrue : sigma_z.at(iz + nztrue * ie);
+            sigma = sigma_z.size() == (unsigned) nztrue ? sigma_z.at(iz) : sigma_z.at(iz + nztrue * ie);
             std::normal_distribution<> e{0, sigma};
             observedEvents.at(iz + rdata.nztrue * ie) = rdata.z.at(iz + rdata.nz * ie) + e(gen);
             observedDataStdDev.at(iz + rdata.nztrue * ie) = sigma;