From 18b69fa71fa1c18de82ca2f0a63ed3b733f9b11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=C3=B4nio=20C=C3=A2ndido=20de=20Lima=20e=20Silva?= Date: Tue, 9 May 2017 11:08:39 -0300 Subject: [PATCH] - Bug: TWFTS and WFTS models are getting the same shortname --- benchmarks/distributed_benchmarks.py | 4 ++-- cheng.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/benchmarks/distributed_benchmarks.py b/benchmarks/distributed_benchmarks.py index d358405..8e05036 100644 --- a/benchmarks/distributed_benchmarks.py +++ b/benchmarks/distributed_benchmarks.py @@ -38,8 +38,8 @@ def run_point(mfts, partitioner, train_data, test_data, window_key=None, transfo from pyFTS.common import Transformations tmp = [song.ConventionalFTS, chen.ConventionalFTS, yu.WeightedFTS, ismailefendi.ImprovedWeightedFTS, - cheng.TrendWeightedFTS, sadaei.ExponentialyWeightedFTS, hofts.HighOrderFTS, hwang.HighOrderFTS, - pwfts.ProbabilisticWeightedFTS] + cheng.TrendWeightedFTS, sadaei.ExponentialyWeightedFTS, hofts.HighOrderFTS, hwang.HighOrderFTS, + pwfts.ProbabilisticWeightedFTS] tmp2 = [Grid.GridPartitioner, Entropy.EntropyPartitioner, FCM.FCMPartitioner] diff --git a/cheng.py b/cheng.py index f2ee57f..1697413 100644 --- a/cheng.py +++ b/cheng.py @@ -43,9 +43,11 @@ class TrendWeightedFLRG(yu.WeightedFLRG): class TrendWeightedFTS(yu.WeightedFTS): """First Order Trend Weighted Fuzzy Time Series""" def __init__(self, name, **kwargs): - super(TrendWeightedFTS, self).__init__("TWFTS " + name) + super(TrendWeightedFTS, self).__init__("") + self.shortname = "TWFTS " + name self.name = "Trend Weighted FTS" self.detail = "Cheng" + self.is_high_order = False def generateFLRG(self, flrs): flrgs = {}