Ticket #3726: sage-3726-part9.patch

a/sage/stats/hmm/chmm.pyx

@@ -220 +220 @@
-        self.m.class_change = NULL
-
-        self.initialized = True
+
+    def __reduce__(self):
+        """
+        Used in pickling.
+
+        EXAMPLES:
+            sage: m = hmm.GaussianHiddenMarkovModel([[1]], [(0,1)], [1], 'test')
+            sage: f,g = m.__reduce__()
+            sage: f(*g) == m
+            True
+        """
+        return unpickle_gaussian_hmm_v0, (self.transition_matrix(), self.emission_parameters(),
+                             self.initial_probabilities(), self.name())
-
-    def __dealloc__(self):
-        """
@@ -688 +701 @@
-        memcpy(sqd.seq[i], T._values , sizeof(double)*T._length)
-
-    return sqd
+
+def unpickle_gaussian_hmm_v0(A, B, pi, name):
+    """
+    EXAMPLES:
+        sage: m = hmm.GaussianHiddenMarkovModel([[1]], [(0,1)], [1], 'test')
+        sage: loads(dumps(m)) == m
+        True
+        sage: sage.stats.hmm.chmm.unpickle_gaussian_hmm_v0(m.transition_matrix(), m.emission_parameters(), m.initial_probabilities(), 'test')
+        Gaussian Hidden Markov Model test with 1 States
+        Transition matrix:
+        [1.0]
+        Emission parameters:
+        [(0.0, 1.0)]
+        Initial probabilities: [1.0]
+    """
+    return GaussianHiddenMarkovModel(A,B,pi,name)

a/sage/stats/hmm/hmm.pyx

@@ -140 +140 @@
-        # Assign model identifier if specified
-        if name is not None: 
-            name = str(name)
-
+
+
-        else:
-            self.m.name = NULL
-
@@ -270 +271 @@
-            elif self.m.s[i].pi > o.m.s[i].pi:
-                return 1
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def __dealloc__(self):
-        """
@@ -304 +319 @@
-        if self._emission_symbols_dict:
-            s += '\nEmission symbols: %s'%self._emission_symbols
-        return s
+
+    def name(self):
+        """
+        Return the name of this model.
+
+        OUTPUT:
+            string or None
+
+        EXAMPLES:
+            sage: m = hmm.DiscreteHiddenMarkovModel([[0.4,0.6],[0.1,0.9]], [[0.0,1.0],[1,1]], [1,2], name='test model')
+            sage: m.name()
+            'test model'
+
+        If the model is not explicitly named then this function returns None:
+            sage: m = hmm.DiscreteHiddenMarkovModel([[0.4,0.6],[0.1,0.9]], [[0.0,1.0],[1,1]], [1,2])
+            sage: m.name() is None
+            True
+        """
+        if self.m.name:
+            s = str(self.m.name)
+            return s
+        else:
+            return None
-
-    def initial_probabilities(self):
-        """
@@ -683 +721 @@
-        d.seq_w[i] = 1
-    d.flags = 0
-    return d
+
+
+def unpickle_discrete_hmm_v0(A, B, pi, emission_symbols,name):
+    """
+    TESTS:
+        sage: m = hmm.DiscreteHiddenMarkovModel([[0.4,0.6],[0.1,0.9]], [[0.0,1.0],[1,1]], [1,0], name='test model')
+        sage: loads(dumps(m)) == m
+        True
+        sage: loads(dumps(m)).name()
+        'test model'
+        sage: sage.stats.hmm.hmm.unpickle_discrete_hmm_v0(m.transition_matrix(), m.emission_matrix(), m.initial_probabilities(), ['a','b'], m.name())
+        Discrete Hidden Markov Model test model with 2 States and 2 Emissions
+        Transition matrix:
+        [0.4 0.6]
+        [0.1 0.9]
+        Emission matrix:
+        [0.0 1.0]
+        [1.0 1.0]
+        Initial probabilities: [1.0, 0.0]
+        Emission symbols: ['a', 'b']
+    """
+    return DiscreteHiddenMarkovModel(A,B,pi,emission_symbols,name)