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

6
pyFTS/models/hwang.py
View File

@ -19,6 +19,10 @@ class HighOrderFTS(fts.FTS):
self.detail = "Hwang" self.detail = "Hwang"
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
@ -57,4 +61,4 @@ class HighOrderFTS(fts.FTS):
return ret return ret
def train(self, data, **kwargs): def train(self, data, **kwargs):
pass pass

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

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