From eb27fabb4c9fc031c53a329e4e6b4658990d1e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=C3=B4nio=20C=C3=A2ndido=20de=20Lima=20e=20Silva?=
 <petronio.candido@gmail.com>
Date: Wed, 7 Sep 2016 18:51:00 -0300
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=B5es=20nas=20classes=20devido=20?=
 =?UTF-8?q?=C3=A0=20modulariza=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 benchmarks.py    |  8 ++++++++
 chen.py          | 10 ++++++----
 FTS.py => fts.py |  0
 3 files changed, 14 insertions(+), 4 deletions(-)
 rename FTS.py => fts.py (100%)

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