Skip to content

Commit

Permalink
Prepare release 0.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwen committed Oct 7, 2022
1 parent 8beae7f commit e60cddc
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion devtool/update_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def update_version(version, path, key, in_quotes=False, extra_space=False):
if __name__ == "__main__":
major = 0
minor = 4
patch = 0
patch = 1

mmp = f"{major}.{minor}.{patch}"
mm = f"{major}.{minor}"
Expand Down
Binary file modified docs/source/auto_examples/auto_examples_jupyter.zip
Binary file not shown.
Binary file modified docs/source/auto_examples/auto_examples_python.zip
Binary file not shown.
19 changes: 19 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@
Change Log
==========

v0.4.1 (2022/10/06)
===================

Added
-----
- Uncertainty quantification via MCMC (@yonatank93). New tutorial and explanation of
the functionality provided in the doc.
- Issue and PR template

Fixed
-----
- Linear regression model parameter shape
- NN multispecies calculator to use parameters of all models

Updated
-------
- Documentation on installing KLIFF and dependences


v0.4.0 (2022/04/27)
===================

Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# The short X.Y version
version = "0.4"
# The full version, including alpha/beta/rc tags
release = "0.4.0"
release = "0.4.1"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion kliff/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.4.0"
__version__ = "0.4.1"

import warnings

Expand Down
10 changes: 2 additions & 8 deletions kliff/descriptors/bispectrum/bispectrum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1666,19 +1666,13 @@ void Bispectrum::init_rootpqarray()
inline void Bispectrum::jtostr(char * str_out, int const j)
{
if (j % 2 == 0) { sprintf(str_out, "%d", j / 2); }
else
{
sprintf(str_out, "%d/2", j);
}
else { sprintf(str_out, "%d/2", j); }
}

inline void Bispectrum::mtostr(char * str_out, int const j, int const m)
{
if (j % 2 == 0) { sprintf(str_out, "%d", m - j / 2); }
else
{
sprintf(str_out, "%d/2", 2 * m - j);
}
else { sprintf(str_out, "%d/2", 2 * m - j); }
}

void Bispectrum::print_clebsch_gordan(FILE * file)
Expand Down
15 changes: 3 additions & 12 deletions kliff/descriptors/symmetry_function/sym_fn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,7 @@ int Descriptor::read_parameter_file(FILE * const filePointer)
iIndex = index;
++index;
}
else
{
iIndex = speciesMap[s1];
}
else { iIndex = speciesMap[s1]; }

std::string s2(spec2);
std::map<std::string, int>::const_iterator jIter = speciesMap.find(s2);
Expand All @@ -193,10 +190,7 @@ int Descriptor::read_parameter_file(FILE * const filePointer)
jIndex = index;
++index;
}
else
{
jIndex = speciesMap[s2];
}
else { jIndex = speciesMap[s2]; }

// store cutoff values
rcut_2D_(iIndex, jIndex) = rcut_2D_(jIndex, iIndex) = cutoff;
Expand Down Expand Up @@ -386,10 +380,7 @@ int Descriptor::read_parameter_file(FILE * const filePointer)
// store info into descriptor class
set_feature_mean_and_std(normalize, size, means.data(), stds.data());
}
else
{
normalize_ = false;
}
else { normalize_ = false; }

// everything is OK
return false;
Expand Down
5 changes: 1 addition & 4 deletions kliff/descriptors/symmetry_function/sym_fn_bind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@ PYBIND11_MODULE(sf, m)
py::tuple t(2);
t[0] = zeta_py;
if (grad) { t[1] = grad_zeta_py; }
else
{
t[1] = n;
}
else { t[1] = n; }
return t;
},
py::arg("i"),
Expand Down

0 comments on commit e60cddc

Please sign in to comment.