Small bugfix in GranularWMVFTS

PYFTS · Apr 12, 2019 · 7319bce · 7319bce
1 parent dca52fb
commit 7319bce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/pyFTS/models/multivariate/common.py b/pyFTS/models/multivariate/common.py
@@ -54,7 +54,7 @@ def fuzzyfy_instance_clustered(data_point, cluster, **kwargs):
     alpha_cut = kwargs.get('alpha_cut', 0.0)
     mode = kwargs.get('mode', 'sets')
     fsets = []
-    for fset in cluster.search(data_point):
+    for fset in cluster.search(data_point, type='name'):
         if cluster.sets[fset].membership(data_point) > alpha_cut:
             if mode == 'sets':
                 fsets.append(fset)

diff --git a/pyFTS/models/multivariate/grid.py b/pyFTS/models/multivariate/grid.py
@@ -48,13 +48,9 @@ def fuzzyfy(self, data, **kwargs):
             return ret
 
         if self.kdtree is not None:
-            fsets = self.search(data, **kwargs)
+            fsets = self.search(data, type='name')
         else:
-            fsets = self.incremental_search(data, **kwargs)
-
-        if len(fsets) == 0:
-            fsets = self.incremental_search(data, **kwargs)
-            raise Exception("{}".format(data))
+            fsets = self.incremental_search(data, type='name')
 
         mode = kwargs.get('mode', 'sets')
         if mode == 'sets':

diff --git a/pyFTS/tests/multivariate.py b/pyFTS/tests/multivariate.py
@@ -188,12 +188,12 @@
 
 from pyFTS.models.multivariate import mvfts, wmvfts, cmvfts, grid
 
-fs = grid.IncrementalGridCluster(explanatory_variables=[vmonth, vhour, vavg], target_variable=vavg)
+fs = grid.GridCluster(explanatory_variables=[vmonth, vhour, vavg], target_variable=vavg)
 
 
 model = cmvfts.ClusteredMVFTS(explanatory_variables=[vmonth, vhour, vavg], target_variable=vavg,
                               partitioner=fs, knn=3)
 
 model.fit(train)
 
-print(len(model))
+model.predict(test)