Update Intervals_Model.py

network-data/Timeuse/HH/Intervals_Model.py

@@ -34,7 +34,7 @@ Durmax = 145
 # Truncate samples and return modulo 144
 def StartSample(N, Sparam):
     mean, sigma = Sparam
-    Starts = random.normal(mean,sigma, size = N).astype(int)
+    Starts = random.normal(mean,sigma, size = N).astype(int)%(Durmax-1)
     return Starts
 
        
@@ -55,7 +55,7 @@ def Coverage(S,E):
     if S==E:
         return set()
     elif E < S:
-        SUP = [i for i in range(S, Durmax,1)]
+        SUP = [i for i in range(S, Durmax-1,1)]
         EDOWN = [i for i in range(0, E+1)]
         return set(SUP + EDOWN)
     else:
@@ -72,7 +72,7 @@ def TotDurSample(N, Sparam, durlist):
             S= Ints[i][j][0]
             E = Ints[i][j][1]
             Cov = Cov.union(Coverage(S,E))
-        out[i] = len(Cov)
+        out[i] = len(Cov)-1
     return out