diff --git a/benchmarks.py b/benchmarks.py index 7816793..1ca0f34 100644 --- a/benchmarks.py +++ b/benchmarks.py @@ -1,3 +1,11 @@ +import numpy as np +import pandas as pd +#import matplotlib as plt +import matplotlib.pyplot as plt +from mpl_toolkits.mplot3d import Axes3D + +from pyFTS import * + # Erro quadrático médio def rmse(predictions,targets): return np.sqrt(np.mean((predictions-targets)**2)) diff --git a/chen.py b/chen.py index d1c144e..768a557 100644 --- a/chen.py +++ b/chen.py @@ -1,4 +1,6 @@ -class FirstOrderFLRG: +from pyFTS import * + +class ConventionalFLRG: def __init__(self,premiss): self.premiss = premiss self.consequent = set() @@ -16,9 +18,9 @@ class FirstOrderFLRG: return tmp + tmp2 -class FirstOrderFTS(FTS): +class ConventionalFTS(fts.FTS): def __init__(self,name): - super(FirstOrderFTS, self).__init__(1,name) + super(ConventionalFTS, self).__init__(1,name) def defuzzy(self,data): @@ -52,7 +54,7 @@ class FirstOrderFTS(FTS): if count > self.order: if last["fuzzyset"] not in self.flrgs: - self.flrgs[last["fuzzyset"]] = FirstOrderFLRG(last["fuzzyset"]) + self.flrgs[last["fuzzyset"]] = ConventionalFLRG(last["fuzzyset"]) self.flrgs[last["fuzzyset"]].append(actual["fuzzyset"]) count = count + 1 diff --git a/FTS.py b/fts.py similarity index 100% rename from FTS.py rename to fts.py