sam/pyFTS
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/petroniocandido/pyFTS

Browse Source
This commit is contained in:
Petrônio Cândido 2018-07-07 17:25:49 -03:00
commit 52544aca88
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyFTS/models/hwang.py
View File

@ -20,6 +20,10 @@ class HighOrderFTS(fts.FTS):
def forecast(self, ndata, **kwargs): def forecast(self, ndata, **kwargs):
if 'order' in kwargs:
self.order = kwargs.get('order',self.order)
self.max_lag = self.order
if self.sets == None: if self.sets == None:
self.sets = self.partitioner.sets self.sets = self.partitioner.sets
ordered_sets = self.partitioner.ordered_sets ordered_sets = self.partitioner.ordered_sets

12
pyFTS/models/seasonal/cmsfts.py
View File

@ -82,13 +82,17 @@ class ContextualMultiSeasonalFTS(sfts.SeasonalFTS):
for k in np.arange(0, len(data)): for k in np.arange(0, len(data)):
flrg = self.flrgs[str(index[k])] if str(index[k]) in self.flrgs:
d = FuzzySet.get_fuzzysets(ndata[k], self.sets, ordered_sets, alpha_cut=self.alpha_cut) flrg = self.flrgs[str(index[k])]
mp = self.get_midpoints(flrg, d) d = FuzzySet.get_fuzzysets(ndata[k], self.sets, ordered_sets, alpha_cut=self.alpha_cut)
ret.append(sum(mp) / len(mp)) mp = self.get_midpoints(flrg, d)
ret.append(sum(mp) / len(mp))
else:
ret.append(np.nan)
return ret return ret