Skip to content

Commit

Permalink
Documentation update
Browse files Browse the repository at this point in the history
  • Loading branch information
petroniocandido committed Apr 9, 2019
1 parent 59f6880 commit df04766
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 259 deletions.
Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
1 change: 0 additions & 1 deletion docs/build/html/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ <h1>All modules for which code is available</h1>
<li><a href="pyFTS/data/rossler.html">pyFTS.data.rossler</a></li>
<li><a href="pyFTS/data/sunspots.html">pyFTS.data.sunspots</a></li>
<li><a href="pyFTS/distributed/spark.html">pyFTS.distributed.spark</a></li>
<li><a href="pyFTS/hyperparam/GridSearch.html">pyFTS.hyperparam.GridSearch</a></li>
<li><a href="pyFTS/hyperparam/Util.html">pyFTS.hyperparam.Util</a></li>
<li><a href="pyFTS/models/chen.html">pyFTS.models.chen</a></li>
<li><a href="pyFTS/models/cheng.html">pyFTS.models.cheng</a></li>
Expand Down
250 changes: 0 additions & 250 deletions docs/build/html/_modules/pyFTS/hyperparam/GridSearch.html

This file was deleted.

2 changes: 1 addition & 1 deletion docs/build/html/modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ <h1>pyFTS<a class="headerlink" href="#pyfts" title="Permalink to this headline">
<li class="toctree-l4"><a class="reference internal" href="pyFTS.hyperparam.html#module-pyFTS.hyperparam">Module contents</a></li>
<li class="toctree-l4"><a class="reference internal" href="pyFTS.hyperparam.html#submodules">Submodules</a></li>
<li class="toctree-l4"><a class="reference internal" href="pyFTS.hyperparam.html#module-pyFTS.hyperparam.Util">pyFTS.hyperparam.Util module</a></li>
<li class="toctree-l4"><a class="reference internal" href="pyFTS.hyperparam.html#module-pyFTS.hyperparam.GridSearch">pyFTS.hyperparam.GridSearch module</a></li>
<li class="toctree-l4"><a class="reference internal" href="pyFTS.hyperparam.html#pyfts-hyperparam-gridsearch-module">pyFTS.hyperparam.GridSearch module</a></li>
<li class="toctree-l4"><a class="reference internal" href="pyFTS.hyperparam.html#pyfts-hyperparam-evolutionary-module">pyFTS.hyperparam.Evolutionary module</a></li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/searchindex.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pyFTS/common/FuzzySet.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,12 @@ def fuzzyfy(data, partitioner, **kwargs):
:param data: input value to be fuzzyfied
:param partitioner: a trained pyFTS.partitioners.Partitioner object
:param kwargs: dict, optional arguments
:keyword alpha_cut: the minimal membership value to be considered on fuzzyfication (only for mode='sets')
:keyword method: the fuzzyfication method (fuzzy: all fuzzy memberships, maximum: only the maximum membership)
:keyword mode: the fuzzyfication mode (sets: return the fuzzy sets names, vector: return a vector with the membership
values for all fuzzy sets, both: return a list with tuples (fuzzy set, membership value) )
:returns a list with the fuzzyfied values, depending on the mode
"""
alpha_cut = kwargs.get('alpha_cut', 0.)
mode = kwargs.get('mode', 'sets')
Expand Down
10 changes: 9 additions & 1 deletion pyFTS/partitioners/partitioner.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def build_index(self):

def fuzzyfy(self, data, **kwargs):
"""
A general method for fuzzyfication.
Fuzzyfy the input data according to this partitioner fuzzy sets.
:param data: input value to be fuzzyfied
:keyword alpha_cut: the minimal membership value to be considered on fuzzyfication (only for mode='sets')
Expand Down Expand Up @@ -178,6 +178,14 @@ def fuzzyfy(self, data, **kwargs):
return sets

def check_bounds(self, data):
'''
Check if the input data is outside the known Universe of Discourse and, if it is, round it to the closest
fuzzy set.
:param data: input data to be verified
:return: the index of the closest fuzzy set when data is outside de universe of discourse or None if
the data is inside the UoD.
'''
if data < self.min:
return 0
elif data > self.max:
Expand Down
6 changes: 3 additions & 3 deletions pyFTS/probabilistic/Mixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class Mixture(ProbabilityDistribution.ProbabilityDistribution):
"""
Mix two or more Probability Distributions smoothing them with weights.
"""
def __init__(self, type="mixture", **kwargs):
self.models = []
Expand All @@ -21,7 +21,7 @@ def density(self, values):
if not isinstance(values, list):
values = [values]

for ct, m in enumerate(self.models):
#for ct, m in enumerate(self.models):

probs = [m.density(values) ]
#probs = [m.density(values) ]

0 comments on commit df04766

Please sign in to comment.