summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2019-02-10 12:01:31 -0500
committerJaron Kent-Dobias <jaron@kent-dobias.com>2019-02-10 12:01:31 -0500
commit15256f6845ab0b769590a9ba2dd1241c49b22879 (patch)
tree3fad4a140a318ebcd2293fd1f5e9f610be9fec57
parent523d311f64b660fa002fa713cc302248e4f657c5 (diff)
downloadfuse_networks-15256f6845ab0b769590a9ba2dd1241c49b22879.tar.gz
fuse_networks-15256f6845ab0b769590a9ba2dd1241c49b22879.tar.bz2
fuse_networks-15256f6845ab0b769590a9ba2dd1241c49b22879.zip
fixed bug in distribution assignment
-rw-r--r--src/measurements.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/measurements.cpp b/src/measurements.cpp
index 360b825..23cfd06 100644
--- a/src/measurements.cpp
+++ b/src/measurements.cpp
@@ -118,18 +118,18 @@ unsigned edge_r_to_ind(graph::coordinate r, double Lx, double Ly, unsigned Mx, u
ma::ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta, unsigned Ncum) :
Lx(Lx), Ly(Ly), Mx(Mx), My(My), beta(beta), G(2 * (unsigned)ceil(Lx * Ly / 2)),
- sc(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- ss(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- sm(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- sa(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- sl(2 * (unsigned)ceil(Lx * Ly / 2), 0),
+ sc(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ ss(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ sm(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ sa(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ sl(3 * (unsigned)ceil(Lx * Ly / 2), 0),
sd(3 * (unsigned)ceil(Lx * Ly / 2), 0),
sD(3 * (unsigned)ceil(Lx * Ly / 2), 0),
- Sc(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- Ss(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- Sm(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- Sa(2 * (unsigned)ceil(Lx * Ly / 2), 0),
- Sl(2 * (unsigned)ceil(Lx * Ly / 2), 0),
+ Sc(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ Ss(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ Sm(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ Sa(3 * (unsigned)ceil(Lx * Ly / 2), 0),
+ Sl(3 * (unsigned)ceil(Lx * Ly / 2), 0),
Sd(3 * (unsigned)ceil(Lx * Ly / 2), 0),
SD(3 * (unsigned)ceil(Lx * Ly / 2), 0),
Ccc(Ncum),