From e09051ad4d45d550057a9500dd6d5f4406ff40d2 Mon Sep 17 00:00:00 2001 From: jpg-130 Date: Tue, 8 Oct 2019 18:03:08 +0530 Subject: [PATCH 1/7] fuzzy operations added --- fuzzy_logic/fuzzy_operations.py | 92 +++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 fuzzy_logic/fuzzy_operations.py diff --git a/fuzzy_logic/fuzzy_operations.py b/fuzzy_logic/fuzzy_operations.py new file mode 100644 index 000000000000..56968f8b993b --- /dev/null +++ b/fuzzy_logic/fuzzy_operations.py @@ -0,0 +1,92 @@ +# Create universe of discourse in python using linspace () +import numpy as np +X = np.linspace(start=0, stop=75, num=75, endpoint=True, retstep=False) + +# Create two fuzzy sets by defining any membership function (trapmf(), gbellmf(),gaussmf(), etc). +import skfuzzy as fuzz +abc1=[0,25,50] +abc2=[25,50,75] +young = fuzz.membership.trimf(X,abc1) +middle_aged = fuzz.membership.trimf(X,abc2) + +# Compute the different operations using inbuilt functions. +one = np.ones(75) +zero = np.zeros((75,)) +#1. Union = max(µA(x), µB(x)) +union = fuzz.fuzzy_or(X, young, X, middle_aged)[1] +#2. Intersection = min(µA(x), µB(x)) +intersection = fuzz.fuzzy_and(X, young, X, middle_aged)[1] +#3. Complement (A) = (1- min(µA(x)) +complement_a = fuzz.fuzzy_not(young) +#4. Difference (A/B) = min(µA(x),(1- µB(x))) +difference = fuzz.fuzzy_and(X, young, X, fuzz.fuzzy_not(middle_aged)[1])[1] +#5. Algebraic Sum = [µA(x) + µB(x) – (µA(x) * µB(x))] +alg_sum = young + middle_aged - (young*middle_aged) +#6. Algebraic Product = (µA(x) * µB(x)) +alg_product = young*middle_aged +#7. Bounded Sum = min[1,(µA(x), µB(x))] +bdd_sum = fuzz.fuzzy_and(X, one, X, young+middle_aged)[1] +#8. Bounded difference = min[0,(µA(x), µB(x))] +bdd_difference = fuzz.fuzzy_or(X, zero, X, young-middle_aged)[1] + +#max-min composition +#max-product composition + + +# Plot each set A, set B and each operation result using plot() and subplot(). +import matplotlib.pyplot as plt + +plt.figure() + +plt.subplot(4,3,1) +plt.plot(X,young) +plt.title("Young") +plt.grid(True) + +plt.subplot(4,3,2) +plt.plot(X,middle_aged) +plt.title("Middle aged") +plt.grid(True) + +plt.subplot(4,3,3) +plt.plot(X,union) +plt.title("union") +plt.grid(True) + +plt.subplot(4,3,4) +plt.plot(X,intersection) +plt.title("intersection") +plt.grid(True) + +plt.subplot(4,3,5) +plt.plot(X,complement_a) +plt.title("complement_a") +plt.grid(True) + +plt.subplot(4,3,6) +plt.plot(X,difference) +plt.title("difference a/b") +plt.grid(True) + +plt.subplot(4,3,7) +plt.plot(X,alg_sum) +plt.title("alg_sum") +plt.grid(True) + +plt.subplot(4,3,8) +plt.plot(X,alg_product) +plt.title("alg_product") +plt.grid(True) + +plt.subplot(4,3,9) +plt.plot(X,bdd_sum) +plt.title("bdd_sum") +plt.grid(True) + +plt.subplot(4,3,10) +plt.plot(X,bdd_difference) +plt.title("bdd_difference") +plt.grid(True) + +plt.subplots_adjust(hspace = 0.5) +plt.show() \ No newline at end of file From 82557035c44e3fd9f300e412e1e3e356e88d5732 Mon Sep 17 00:00:00 2001 From: jpg-130 Date: Tue, 8 Oct 2019 18:08:16 +0530 Subject: [PATCH 2/7] fuzzy inference system added --- fuzzy_logic/fis_washing_mc.py | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 fuzzy_logic/fis_washing_mc.py diff --git a/fuzzy_logic/fis_washing_mc.py b/fuzzy_logic/fis_washing_mc.py new file mode 100644 index 000000000000..900b7d0896c4 --- /dev/null +++ b/fuzzy_logic/fis_washing_mc.py @@ -0,0 +1,47 @@ +import skfuzzy as fuzz +from skfuzzy import control as ctrl +import numpy as np +import matplotlib.pyplot as plt + +#wash time depend on amount of dirt and grease +dirt = ctrl.Antecedent(np.arange(0, 100, 1), 'dirt') #scale +grease = ctrl.Antecedent(np.arange(0, 100, 1), 'grease') #scale +wash_time = ctrl.Consequent(np.arange(0, 60, 1), 'wash_time') #minutes +wash_time.defuzzify_method = 'mom' + +#membership functions +dirt['ld'] = fuzz.trimf(dirt.universe, [0, 0, 50]) +dirt['md'] = fuzz.trimf(dirt.universe, [0, 50, 100]) +dirt['hd'] = fuzz.trimf(dirt.universe, [50, 100, 100]) + +grease['lg'] = fuzz.trimf(grease.universe, [0, 0, 50]) +grease['mg'] = fuzz.trimf(grease.universe, [0, 50, 100]) +grease['hg'] = fuzz.trimf(grease.universe, [50, 100, 100]) + +wash_time['vl'] = fuzz.trimf(wash_time.universe, [0, 0, 10]) +wash_time['l'] = fuzz.trimf(wash_time.universe, [0, 10, 25]) +wash_time['m'] = fuzz.trimf(wash_time.universe, [10, 25, 40]) +wash_time['h'] = fuzz.trimf(wash_time.universe, [25, 40, 60]) +wash_time['vh'] = fuzz.trimf(wash_time.universe, [40, 60, 60]) + +#Rules +r1 = ctrl.Rule(dirt['ld'] & grease['lg'], wash_time['vl']) +r2 = ctrl.Rule(dirt['ld'] & grease['mg'], wash_time['m']) +r3 = ctrl.Rule(dirt['ld'] & grease['hg'], wash_time['h']) +r4 = ctrl.Rule(dirt['md'] & grease['lg'], wash_time['l']) +r5 = ctrl.Rule(dirt['md'] & grease['mg'], wash_time['m']) +r6 = ctrl.Rule(dirt['md'] & grease['hg'], wash_time['vh']) +r7 = ctrl.Rule(dirt['hd'] & grease['lg'], wash_time['m']) +r8 = ctrl.Rule(dirt['hd'] & grease['mg'], wash_time['h']) +r9 = ctrl.Rule(dirt['hd'] & grease['hg'], wash_time['vh']) + +wash_ctrl = ctrl.ControlSystem([r1, r2, r3, r4, r5, r6, r7, r8, r9]) +machine = ctrl.ControlSystemSimulation(wash_ctrl) + +machine.input['dirt'], machine.input['grease'] = 80, 90 +machine.compute() +print('Wash time: ', machine.output['wash_time']) + +dirt.view() +grease.view() +wash_time.view(sim=machine) \ No newline at end of file From 1e3c349d7488a668f3d0cc39dab1850230185a41 Mon Sep 17 00:00:00 2001 From: jpg-130 Date: Tue, 8 Oct 2019 18:13:53 +0530 Subject: [PATCH 3/7] unnecessary files removed --- fuzzy_logic/fis_washing_mc.py | 47 ----------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 fuzzy_logic/fis_washing_mc.py diff --git a/fuzzy_logic/fis_washing_mc.py b/fuzzy_logic/fis_washing_mc.py deleted file mode 100644 index 900b7d0896c4..000000000000 --- a/fuzzy_logic/fis_washing_mc.py +++ /dev/null @@ -1,47 +0,0 @@ -import skfuzzy as fuzz -from skfuzzy import control as ctrl -import numpy as np -import matplotlib.pyplot as plt - -#wash time depend on amount of dirt and grease -dirt = ctrl.Antecedent(np.arange(0, 100, 1), 'dirt') #scale -grease = ctrl.Antecedent(np.arange(0, 100, 1), 'grease') #scale -wash_time = ctrl.Consequent(np.arange(0, 60, 1), 'wash_time') #minutes -wash_time.defuzzify_method = 'mom' - -#membership functions -dirt['ld'] = fuzz.trimf(dirt.universe, [0, 0, 50]) -dirt['md'] = fuzz.trimf(dirt.universe, [0, 50, 100]) -dirt['hd'] = fuzz.trimf(dirt.universe, [50, 100, 100]) - -grease['lg'] = fuzz.trimf(grease.universe, [0, 0, 50]) -grease['mg'] = fuzz.trimf(grease.universe, [0, 50, 100]) -grease['hg'] = fuzz.trimf(grease.universe, [50, 100, 100]) - -wash_time['vl'] = fuzz.trimf(wash_time.universe, [0, 0, 10]) -wash_time['l'] = fuzz.trimf(wash_time.universe, [0, 10, 25]) -wash_time['m'] = fuzz.trimf(wash_time.universe, [10, 25, 40]) -wash_time['h'] = fuzz.trimf(wash_time.universe, [25, 40, 60]) -wash_time['vh'] = fuzz.trimf(wash_time.universe, [40, 60, 60]) - -#Rules -r1 = ctrl.Rule(dirt['ld'] & grease['lg'], wash_time['vl']) -r2 = ctrl.Rule(dirt['ld'] & grease['mg'], wash_time['m']) -r3 = ctrl.Rule(dirt['ld'] & grease['hg'], wash_time['h']) -r4 = ctrl.Rule(dirt['md'] & grease['lg'], wash_time['l']) -r5 = ctrl.Rule(dirt['md'] & grease['mg'], wash_time['m']) -r6 = ctrl.Rule(dirt['md'] & grease['hg'], wash_time['vh']) -r7 = ctrl.Rule(dirt['hd'] & grease['lg'], wash_time['m']) -r8 = ctrl.Rule(dirt['hd'] & grease['mg'], wash_time['h']) -r9 = ctrl.Rule(dirt['hd'] & grease['hg'], wash_time['vh']) - -wash_ctrl = ctrl.ControlSystem([r1, r2, r3, r4, r5, r6, r7, r8, r9]) -machine = ctrl.ControlSystemSimulation(wash_ctrl) - -machine.input['dirt'], machine.input['grease'] = 80, 90 -machine.compute() -print('Wash time: ', machine.output['wash_time']) - -dirt.view() -grease.view() -wash_time.view(sim=machine) \ No newline at end of file From 92558c9f4f69b21f33586c63576738797385c45b Mon Sep 17 00:00:00 2001 From: jpg-130 Date: Wed, 9 Oct 2019 10:11:48 +0530 Subject: [PATCH 4/7] requirements added --- fuzzy_logic/requirements.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fuzzy_logic/requirements.txt diff --git a/fuzzy_logic/requirements.txt b/fuzzy_logic/requirements.txt new file mode 100644 index 000000000000..986a2c0b4440 --- /dev/null +++ b/fuzzy_logic/requirements.txt @@ -0,0 +1,7 @@ +# Library dependencies for the python code. You need to install these +with +# `pip install -r requirements.txt` before you can run this. + +#### ESSENTIAL LIBRARIES FOR MAIN FUNCTIONALITY #### +skfuzzy + From 21da9edfca2300968e9998165e1d0497093532c0 Mon Sep 17 00:00:00 2001 From: jpg-130 Date: Wed, 9 Oct 2019 10:55:41 +0530 Subject: [PATCH 5/7] Modified requirements for travis ci --- fuzzy_logic/fuzzy_operations.py | 8 ++++++++ fuzzy_logic/requirements.txt | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 fuzzy_logic/requirements.txt diff --git a/fuzzy_logic/fuzzy_operations.py b/fuzzy_logic/fuzzy_operations.py index 56968f8b993b..cff95b004ec0 100644 --- a/fuzzy_logic/fuzzy_operations.py +++ b/fuzzy_logic/fuzzy_operations.py @@ -1,3 +1,11 @@ +"""README, Author - Jigyasa Gandhi(mailto:jigsgandhi97@gmail.com) +Requirements: + - skfuzzy + - numpy + - matplotlib +Python: + - 3.5 +""" # Create universe of discourse in python using linspace () import numpy as np X = np.linspace(start=0, stop=75, num=75, endpoint=True, retstep=False) diff --git a/fuzzy_logic/requirements.txt b/fuzzy_logic/requirements.txt deleted file mode 100644 index 986a2c0b4440..000000000000 --- a/fuzzy_logic/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Library dependencies for the python code. You need to install these -with -# `pip install -r requirements.txt` before you can run this. - -#### ESSENTIAL LIBRARIES FOR MAIN FUNCTIONALITY #### -skfuzzy - From 5c7fd7b1623fa30144a31531528ca33083ae25b9 Mon Sep 17 00:00:00 2001 From: jpg-130 Date: Wed, 9 Oct 2019 11:05:36 +0530 Subject: [PATCH 6/7] Modified requirements for travis ci --- fuzzy_logic/fuzzy_operations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fuzzy_logic/fuzzy_operations.py b/fuzzy_logic/fuzzy_operations.py index cff95b004ec0..e497eabd1690 100644 --- a/fuzzy_logic/fuzzy_operations.py +++ b/fuzzy_logic/fuzzy_operations.py @@ -1,6 +1,6 @@ """README, Author - Jigyasa Gandhi(mailto:jigsgandhi97@gmail.com) Requirements: - - skfuzzy + - scikit-fuzzy - numpy - matplotlib Python: @@ -97,4 +97,4 @@ plt.grid(True) plt.subplots_adjust(hspace = 0.5) -plt.show() \ No newline at end of file +plt.show() From 9ce96b2b3081f12a82f3503bfb5257154d5c0d9a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 18 Oct 2019 20:20:14 +0200 Subject: [PATCH 7/7] Add scikit-fuzzy to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index f5790ad53c30..4f6ff321c268 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ pandas pillow pytest requests +scikit-fuzzy sklearn sympy tensorflow