Changed order of HMM arguments

It made more sense for initial-prob to come before the other probabilities, so now it does.
dwysocki · Mar 20, 2015 · eb73588 · eb73588
1 parent c8c830b
commit eb73588
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/src/hidden_markov_music/core.clj b/src/hidden_markov_music/core.clj
@@ -22,6 +22,11 @@
 (def song-model
   (HMM. song-states
         song-notes
+        {:beginning 1.0,
+         :middle    0.0,
+         :chorus    0.0,
+         :finale    0.0,
+         :end       0.0}
         {:beginning {:beginning 0.8,
                      :middle    0.2,
                      :chorus    0.0,
@@ -47,12 +52,7 @@
                      :chorus    0.0,
                      :finale    0.0,
                      :end       1.0}}
-        (stats/random-row-stochastic-map song-states song-notes)
-        {:beginning 1.0,
-         :middle    0.0,
-         :chorus    0.0,
-         :finale    0.0,
-         :end       0.0}))
+        (stats/random-row-stochastic-map song-states song-notes)))
 
 (def models
   {"weather" random-weather-model,

diff --git a/src/hidden_markov_music/hmm.clj b/src/hidden_markov_music/hmm.clj
@@ -7,9 +7,9 @@
 (defrecord HMM
     [states
      observations
+     initial-prob
      transition-prob
-     observation-prob
-     initial-prob])
+     observation-prob])
 
 ;; HMM has no docstring, but the functions it generates do.
 ;; attach some more descriptive text to those functions
@@ -24,9 +24,9 @@
   (HMM.
     states
     observations
+    (stats/random-stochastic-map states)
     (stats/random-row-stochastic-map states states)
-    (stats/random-row-stochastic-map states observations)
-    (stats/random-stochastic-map states)))
+    (stats/random-row-stochastic-map states observations)))
 
 (defn forward-probability-initial
   "Returns `α_1(i)`, for all states `i`.
@@ -476,9 +476,9 @@
         new-model (HMM.
                     (:states model)
                     (:observations model)
+                    new-initial-probs
                     new-transition-probs
-                    new-observation-probs
-                    new-initial-probs)
+                    new-observation-probs)
 
         new-likelihood (likelihood-forward new-model observations)]
     (if (> (- new-likelihood likelihood)

diff --git a/test/hidden_markov_music/test_models.clj b/test/hidden_markov_music/test_models.clj
@@ -8,6 +8,10 @@
 
         [:good :bad :so-so]
 
+        {:sunny  (/ 3.0),
+         :cloudy (/ 3.0),
+         :rainy  (/ 3.0)}
+
         {:sunny  {:sunny  0.5,
                   :cloudy 0.3,
                   :rainy  0.2},
@@ -26,11 +30,7 @@
                   :so-so 0.5},
          :rainy  {:good  0.1,
                   :bad   0.6,
-                  :so-so 0.3}}
-
-        {:sunny  (/ 3.0)
-         :cloudy (/ 3.0),
-         :rainy  (/ 3.0)}))
+                  :so-so 0.3}}))
 
 (def ibe-ex-11-observations
   [:good :good :so-so :bad :bad])
@@ -48,6 +48,10 @@
 
         [:a :b :c]
 
+        {:A 1.0,
+         :B 0.0,
+         :C 0.0}
+
         {:A {:A 0.0,
              :B 1.0,
              :C 0.0},
@@ -66,11 +70,7 @@
              :c 0.0},
          :C {:a 0.0,
              :b 0.0,
-             :c 1.0}}
-
-        {:A 1.0,
-         :B 0.0,
-         :C 0.0}))
+             :c 1.0}}))
 
 (def deterministic-certain-observations
   [:a :b :c :a :b :c])
@@ -87,6 +87,9 @@
 
         [:a :b]
 
+        {:A 0.5,
+         :B 0.5}
+
         {:A {:A 0.0,
              :B 1.0},
          :B {:A 1.0,
@@ -95,10 +98,7 @@
         {:A {:a 1.0,
              :b 0.0},
          :B {:a 0.0,
-             :b 1.0}}
-
-        {:A 0.5,
-         :B 0.5}))
+             :b 1.0}}))
 
 (def a-50-50-observations
   [:a :b :a :b :a :b])