Skip to content

Release 0.2.1 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 69 commits into from
Dec 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
de4d369
Merge pull request #48 from yuta-nakahara/release
yuta-nakahara Nov 20, 2022
b6f2101
Remove _GenNode and add _Node
yuta-nakahara Dec 8, 2022
0d83bda
Remove _LearnNode
yuta-nakahara Dec 8, 2022
cde7eba
Modify h_params_recursion
yuta-nakahara Dec 8, 2022
ffab7e0
Delete contexttree_test.py
yuta-nakahara Dec 8, 2022
6c3574c
Merge pull request #49 from yuta-nakahara/develop-contexttree
yuta-nakahara Dec 8, 2022
ae41e62
Update visualization
yuta-nakahara Dec 9, 2022
16a9351
Merge pull request #50 from yuta-nakahara/develop-contexttree
yuta-nakahara Dec 9, 2022
7d294fb
Change _GenNode to _Node
yuta-nakahara Dec 12, 2022
a9942ec
Reduce arguments of _Node.__init__()
yuta-nakahara Dec 12, 2022
de99d95
Revise set_h_params
yuta-nakahara Dec 13, 2022
1249653
Modify gen_params
yuta-nakahara Dec 14, 2022
159b126
Bug fix
yuta-nakahara Dec 14, 2022
c06e23f
Remove _LearnNode
yuta-nakahara Dec 16, 2022
e7347ad
Revise set_params and estimate_params
yuta-nakahara Dec 16, 2022
99cdd2e
Revise set_h_params and make_prediction
yuta-nakahara Dec 16, 2022
41279d7
Pass self.rng to SubModel.GenModel
yuta-nakahara Dec 16, 2022
040474f
Create _metatree.py
yuta-nakahara Dec 16, 2022
0e0192a
Add pos_int_vec
yuta-nakahara Dec 16, 2022
691a0e7
Merge branch 'develop-check' into develop-metatree-continuous
yuta-nakahara Dec 16, 2022
e267f23
Add pos_ints
yuta-nakahara Dec 16, 2022
d6d1b17
Merge branch 'develop-check' into develop-metatree-continuous
yuta-nakahara Dec 16, 2022
09ebf4f
Revise set_h_params in GenModel
yuta-nakahara Dec 16, 2022
9a468a7
Merge branch 'develop-metatree' into develop-metatree-continuous
yuta-nakahara Dec 16, 2022
6f102fd
Revise set_h, h0, hn_params_recursion
yuta-nakahara Dec 16, 2022
fdc2878
Merge branch 'develop-metatree' into develop-metatree-continuous
yuta-nakahara Dec 16, 2022
8b4e35c
Add continuous features to GenModel
yuta-nakahara Dec 17, 2022
04cab6a
Revise visualize_model
yuta-nakahara Dec 17, 2022
dd81760
Modify __init__, get, set, visualize
yuta-nakahara Dec 18, 2022
7445e62
Faster copy of list and array
yuta-nakahara Dec 18, 2022
c2a9b00
Modify update_posterior
yuta-nakahara Dec 18, 2022
5a8458d
Modify _given_MT
yuta-nakahara Dec 18, 2022
c107fd3
Modify estimate_params
yuta-nakahara Dec 18, 2022
d7b2ea0
Modify calc_pred_dist
yuta-nakahara Dec 18, 2022
2bffa9f
Modify make_prediction
yuta-nakahara Dec 18, 2022
3b52aa3
Acceleration
yuta-nakahara Dec 18, 2022
d1583f3
Delete MAP prediction
yuta-nakahara Dec 18, 2022
10a408f
Add return self
yuta-nakahara Dec 20, 2022
a7520a3
Merge pull request #51 from yuta-nakahara/develop-add_return_self
yuta-nakahara Dec 20, 2022
42aa4d6
Merge branch 'develop' into develop-metatree-continuous
yuta-nakahara Dec 20, 2022
7f27f22
Refine sub_h0_params and sub_hn_params sharing
yuta-nakahara Dec 21, 2022
6be85f0
Refine description
yuta-nakahara Dec 21, 2022
11f4bf7
Update bernoulli
yuta-nakahara Dec 21, 2022
6e886e5
Update exponential
yuta-nakahara Dec 21, 2022
80d6628
Update normal
yuta-nakahara Dec 21, 2022
80826d3
Update poisson
yuta-nakahara Dec 21, 2022
cc21a4b
Update multivariate_normal
yuta-nakahara Dec 21, 2022
4520f77
Update linearregression
yuta-nakahara Dec 21, 2022
65d7ab1
Update autoregressive
yuta-nakahara Dec 22, 2022
6bd570c
Add reshaping of x
yuta-nakahara Dec 22, 2022
23e3ca4
Update categorical
yuta-nakahara Dec 22, 2022
90d3ab8
Minor change
yuta-nakahara Dec 22, 2022
107fa79
Merge pull request #52 from yuta-nakahara/develop-update_basic_models
yuta-nakahara Dec 22, 2022
8574e98
Merge branch 'develop' into develop-metatree-continuous
yuta-nakahara Dec 22, 2022
f3da427
Support categorical and linearregression
yuta-nakahara Dec 23, 2022
80d7867
Revise documents
yuta-nakahara Dec 23, 2022
0b6d5eb
Delete _metatree_x_discrete.py
yuta-nakahara Dec 23, 2022
ae6c960
Merge pull request #53 from yuta-nakahara/develop-metatree-continuous
yuta-nakahara Dec 23, 2022
725ea62
Revise index search
yuta-nakahara Dec 24, 2022
3b4defb
Delete metatree_test.py
yuta-nakahara Dec 24, 2022
b49f283
Merge pull request #54 from yuta-nakahara/develop-metatree
yuta-nakahara Dec 24, 2022
8255f95
Revise contexttree
yuta-nakahara Dec 28, 2022
71ae588
Merge pull request #55 from yuta-nakahara/develop-contexttree
yuta-nakahara Dec 28, 2022
4d2eefd
Minor changes
yuta-nakahara Dec 28, 2022
ddfdae2
Update sphinx sources
yuta-nakahara Dec 28, 2022
c68d531
Update _metatree.py
yuta-nakahara Dec 28, 2022
1566515
Update Web pages
yuta-nakahara Dec 28, 2022
5ab74b2
Update setup.py
yuta-nakahara Dec 28, 2022
dd64ef4
Merge branch 'main' into release-0.2.1
yuta-nakahara Dec 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Plain text

```
Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo,
S. Saito, K. Kazama, T. Matsushima, ``BayesML 0.2.0,''
S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.1,''
[Online] https://github.com/yuta-nakahara/BayesML
```

Expand All @@ -147,8 +147,8 @@ BibTeX
@misc{bayesml,
author = {Nakahara Yuta and Ichijo Naoki and Shimada Koshi and
Iikubo Yuji and Saito Shota and Kazama Koki and
Matsushima Toshiyasu}
title = {BayesML 0.2.0},
Matsushima Toshiyasu and {BayesML Developers}},
title = {BayesML 0.2.1},
howpublished = {\url{https://github.com/yuta-nakahara/BayesML}},
year = {2022}
}
Expand Down
6 changes: 3 additions & 3 deletions README_jp.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ BayesMLへのコントリビューションを考えてくださってありが

```
Y. Nakahara, N. Ichijo, K. Shimada, Y. Iikubo,
S. Saito, K. Kazama, T. Matsushima, ``BayesML 0.2.0,''
S. Saito, K. Kazama, T. Matsushima, BayesML Developers, ``BayesML 0.2.1,''
[Online] https://github.com/yuta-nakahara/BayesML
```

Expand All @@ -144,8 +144,8 @@ BibTeX
@misc{bayesml,
author = {Nakahara Yuta and Ichijo Naoki and Shimada Koshi and
Iikubo Yuji and Saito Shota and Kazama Koki and
Matsushima Toshiyasu}
title = {BayesML 0.2.0},
Matsushima Toshiyasu and {BayesML Developers}},
title = {BayesML 0.2.1},
howpublished = {\url{https://github.com/yuta-nakahara/BayesML}},
year = {2022}
}
Expand Down
16 changes: 16 additions & 0 deletions bayesml/_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ def nonneg_ints(val,val_name,exception_class):
return val
raise(exception_class(val_name + " must be int or a numpy.ndarray whose dtype is int. Its values must be non-negative (including 0)."))

def pos_ints(val,val_name,exception_class):
try:
return pos_int(val,val_name,exception_class)
except:
pass
if type(val) is np.ndarray:
if np.issubdtype(val.dtype,np.integer) and np.all(val>0):
return val
raise(exception_class(val_name + " must be int or a numpy.ndarray whose dtype is int. Its values must be positive (not including 0)."))

def int_vec(val,val_name,exception_class):
if type(val) is np.ndarray:
if np.issubdtype(val.dtype,np.integer) and val.ndim == 1:
Expand All @@ -59,6 +69,12 @@ def nonneg_int_vec(val,val_name,exception_class):
return val
raise(exception_class(val_name + " must be a 1-dimensional numpy.ndarray whose dtype is int. Its values must be non-negative (including 0)."))

def pos_int_vec(val,val_name,exception_class):
if type(val) is np.ndarray:
if np.issubdtype(val.dtype,np.integer) and val.ndim == 1 and np.all(val>0):
return val
raise(exception_class(val_name + " must be a 1-dimensional numpy.ndarray whose dtype is int. Its values must be positive (not including 0)."))

def nonneg_int_vecs(val,val_name,exception_class):
if type(val) is np.ndarray:
if np.issubdtype(val.dtype,np.integer) and val.ndim >= 1 and np.all(val>=0):
Expand Down
Loading