Fixed "freq" - it was not normalized to 1. Bump to 1.0.8.

jkff · May 1, 2012 · 91115cb · 91115cb
1 parent 20910fe
commit 91115cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Tools/TimePlot/Plots.hs b/Tools/TimePlot/Plots.hs
@@ -32,7 +32,8 @@ initGen (KindACount bs)         = genActivity (\sns n -> n) bs
 initGen (KindAPercent bs b)     = genActivity (\sns n -> 100*n/b) bs
 initGen (KindAFreq bs)          = genActivity (\sns n -> if n == 0 then 0 else (n / sum (M.elems sns))) bs
 initGen (KindFreq bs k)         = genAtoms atoms2freqs bs k
-  where  atoms2freqs as m = let n = length as in 0:[fromIntegral (M.findWithDefault 0 a m)/fromIntegral n | a <- as]
+  where  atoms2freqs as m = let s = sum [c | (a,c) <- M.toList m] 
+                            in if s==0 then [0] else 0:[fromIntegral (M.findWithDefault 0 a m)/fromIntegral s | a <- as]
 initGen (KindHistogram bs k)    = genAtoms atoms2hist bs k
   where  atoms2hist as m = 0:[fromIntegral (M.findWithDefault 0 a m) | a <- as]
 initGen KindEvent               = genEvent

diff --git a/timeplot.cabal b/timeplot.cabal
@@ -1,5 +1,5 @@
 name: timeplot
-version: 1.0.7
+version: 1.0.8
 cabal-version: >=1.6
 build-type: Simple
 license: BSD3