Merge pull request #60 from yuta-nakahara/hotfix-metatree

Hotfix metatree

Author: yuta-nakahara

README.md

@@ -137,7 +137,7 @@ Plain text
 
 ```
 Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo, 
-S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.2,'' 
+S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.3,'' 
 [Online] https://github.com/yuta-nakahara/BayesML
 ```
 
@@ -148,7 +148,7 @@ BibTeX
   author = {Nakahara Yuta and Ichijo Naoki and Shimada Koshi and
             Iikubo Yuji and Saito Shota and Kazama Koki and
             Matsushima Toshiyasu and {BayesML Developers}},
-  title = {BayesML 0.2.2},
+  title = {BayesML 0.2.3},
   howpublished = {\url{https://github.com/yuta-nakahara/BayesML}},
   year = {2022}
 }

README_jp.md

@@ -134,7 +134,7 @@ BayesMLへのコントリビューションを考えてくださってありが
 
 ```
 Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo, 
-S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.2,'' 
+S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.3,'' 
 [Online] https://github.com/yuta-nakahara/BayesML
 ```
 
@@ -145,7 +145,7 @@ BibTeX
   author = {Nakahara Yuta and Ichijo Naoki and Shimada Koshi and
             Iikubo Yuji and Saito Shota and Kazama Koki and
             Matsushima Toshiyasu and {BayesML Developers}},
-  title = {BayesML 0.2.2},
+  title = {BayesML 0.2.3},
   howpublished = {\url{https://github.com/yuta-nakahara/BayesML}},
   year = {2022}
 }

bayesml/metatree/_metatree.py

@@ -2416,13 +2416,17 @@ def make_prediction(self,loss="squared"):
             The predicted value under the given loss function. 
         """
         if loss == "squared":
-            tmp_pred_vec = np.empty(len(self.hn_metatree_list))
+            if self.SubModel is categorical:
+                tmp_pred_vec = np.empty([len(self.hn_metatree_list),self.sub_constants['c_degree']])
+            else:
+                tmp_pred_vec = np.empty(len(self.hn_metatree_list))
             for i,metatree in enumerate(self.hn_metatree_list):
                 tmp_pred_vec[i] = self._make_prediction_recursion_squared(metatree)
             return self.hn_metatree_prob_vec @ tmp_pred_vec
         elif loss == "0-1":
             if self.SubModel in CLF_MODELS:
-                tmp_pred_dist_vec = np.empty([len(self.hn_metatree_list),2])
+                degree = 2 if self.SubModel is bernoulli else self.sub_constants['c_degree']
+                tmp_pred_dist_vec = np.empty([len(self.hn_metatree_list),degree])
                 for i,metatree in enumerate(self.hn_metatree_list):
                     tmp_pred_dist_vec[i] = self._make_prediction_recursion_kl(metatree)
                 return np.argmax(self.hn_metatree_prob_vec @ tmp_pred_dist_vec)
@@ -2431,7 +2435,8 @@ def make_prediction(self,loss="squared"):
                                     +"only when self.SubModel is bernoulli or categorical."))
         elif loss == "KL":
             if self.SubModel in CLF_MODELS:
-                tmp_pred_dist_vec = np.empty([len(self.hn_metatree_list),2])
+                degree = 2 if self.SubModel is bernoulli else self.sub_constants['c_degree']
+                tmp_pred_dist_vec = np.empty([len(self.hn_metatree_list),degree])
                 for i,metatree in enumerate(self.hn_metatree_list):
                     tmp_pred_dist_vec[i] = self._make_prediction_recursion_kl(metatree)
                 return self.hn_metatree_prob_vec @ tmp_pred_dist_vec

doc/developers.rst

@@ -59,7 +59,7 @@ Plain text
 .. code-block::
 
    Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo, 
-   S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.2,'' 
+   S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.3,'' 
    [Online] https://github.com/yuta-nakahara/BayesML
 
 
@@ -71,7 +71,7 @@ BibTeX
    author = {Nakahara Yuta and Ichijo Naoki and Shimada Koshi and
                Iikubo Yuji and Saito Shota and Kazama Koki and
                Matsushima Toshiyasu and {BayesML Developers}},
-   title = {BayesML 0.2.2},
+   title = {BayesML 0.2.3},
    howpublished = {\url{https://github.com/yuta-nakahara/BayesML}},
    year = {2022}
    }

doc/index.rst

@@ -150,7 +150,7 @@ Plain text
 .. code-block::
 
    Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo, 
-   S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.2,'' 
+   S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.3,'' 
    [Online] https://github.com/yuta-nakahara/BayesML
 
 
@@ -162,7 +162,7 @@ BibTeX
    author = {Nakahara Yuta and Ichijo Naoki and Shimada Koshi and
                Iikubo Yuji and Saito Shota and Kazama Koki and
                Matsushima Toshiyasu and {BayesML Developers}},
-   title = {BayesML 0.2.2},
+   title = {BayesML 0.2.3},
    howpublished = {\url{https://github.com/yuta-nakahara/BayesML}},
    year = {2022}
    }

docs/developers.html

@@ -380,7 +380,7 @@ <h3>Citation<a class="headerlink" href="#citation" title="Permalink to this head
 <p>When you use BayesML for your academic work, please provide the following bibliographic reference.</p>
 <p>Plain text</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo,
-S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.2,&#39;&#39;
+S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.3,&#39;&#39;
 [Online] https://github.com/yuta-nakahara/BayesML
 </pre></div>
 </div>
@@ -389,7 +389,7 @@ <h3>Citation<a class="headerlink" href="#citation" title="Permalink to this head
 <span class="na">author</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{Nakahara Yuta and Ichijo Naoki and Shimada Koshi and</span>
 <span class="s">            Iikubo Yuji and Saito Shota and Kazama Koki and</span>
 <span class="s">            Matsushima Toshiyasu and {BayesML Developers}}</span><span class="p">,</span><span class="w"></span>
-<span class="na">title</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{BayesML 0.2.2}</span><span class="p">,</span><span class="w"></span>
+<span class="na">title</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{BayesML 0.2.3}</span><span class="p">,</span><span class="w"></span>
 <span class="na">howpublished</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{\url{https://github.com/yuta-nakahara/BayesML}}</span><span class="p">,</span><span class="w"></span>
 <span class="na">year</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{2022}</span><span class="w"></span>
 <span class="p">}</span><span class="w"></span>

docs/index.html

@@ -480,7 +480,7 @@ <h2>Citation<a class="headerlink" href="#citation" title="Permalink to this head
 <p>When you use BayesML for your academic work, please provide the following bibliographic reference.</p>
 <p>Plain text</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo,
-S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.2,&#39;&#39;
+S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.3,&#39;&#39;
 [Online] https://github.com/yuta-nakahara/BayesML
 </pre></div>
 </div>
@@ -489,7 +489,7 @@ <h2>Citation<a class="headerlink" href="#citation" title="Permalink to this head
 <span class="na">author</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{Nakahara Yuta and Ichijo Naoki and Shimada Koshi and</span>
 <span class="s">            Iikubo Yuji and Saito Shota and Kazama Koki and</span>
 <span class="s">            Matsushima Toshiyasu and {BayesML Developers}}</span><span class="p">,</span><span class="w"></span>
-<span class="na">title</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{BayesML 0.2.2}</span><span class="p">,</span><span class="w"></span>
+<span class="na">title</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{BayesML 0.2.3}</span><span class="p">,</span><span class="w"></span>
 <span class="na">howpublished</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{\url{https://github.com/yuta-nakahara/BayesML}}</span><span class="p">,</span><span class="w"></span>
 <span class="na">year</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{2022}</span><span class="w"></span>
 <span class="p">}</span><span class="w"></span>

setup.py

@@ -33,7 +33,7 @@
 
 setup(
     name='bayesml',
-    version='0.2.2',
+    version='0.2.3',
     packages=find_packages(),
     author='Yuta Nakahara et al.',
     author_email='yuta.nakahara@aoni.waseda.jp',