fix type-2 plotting (#36)

Author: lucaferranti

docs/src/changelog.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - ![](https://img.shields.io/badge/new%20feature-green.svg) added semi-elliptic and singleton membership functions
 - ![](https://img.shields.io/badge/new%20feature-green.svg) added `gensurf` to plot generating surface
 - ![](https://img.shields.io/badge/bugfix-purple.svg) fix plotting of systems with several rules and membership functions.
+- ![](https://img.shields.io/badge/bugfix-purple.svg) fix plotting of Type-2 systems
 
 ## v0.1.2 -- 2023-03-12
 

src/plotting.jl

@@ -20,10 +20,16 @@ end
     legend --> nothing
     @series begin
         fillrange := x -> mf.hi(x)
-        fillalpha --> 1.0
-        linealpha --> 0
+        fillalpha --> 0.5
+        linealpha --> 1
+        linewidth --> 2
         x -> mf.lo(x), low, high
     end
+    @series begin
+        primary := false
+        linewidth --> 2
+        x -> mf.hi(x), low, high
+    end
 end
 
 @recipe f(mf::AbstractPredicate, dom::Domain) = mf, low(dom), high(dom)
@@ -91,16 +97,17 @@ end
     nrules = length(fis.rules)
     layout := (nrules, nin + nout)
     size --> (300 * (nin + nout), 200 * nrules)
-    for rule in fis.rules
+    for (i, rule) in enumerate(fis.rules)
         ants = leaves(rule.antecedent)
-        for (varname, var) in pairs(fis.inputs)
+        for (j, (varname, var)) in enumerate(pairs(fis.inputs))
             idx = findall(x -> subject(x) == varname, ants)
             length(idx) > 1 &&
                 throw(ArgumentError("Cannot plot repeated variables in rules"))
 
             @series if length(idx) == 1
                 rel = ants[first(idx)]
                 title := string(rel)
+                subplot := (i - 1) * (nin + nout) + j
                 # TODO: use own recipes for negation and relation
                 if rel isa FuzzyNegation
                     legend --> false
@@ -109,23 +116,26 @@ end
                     var.mfs[predicate(rel)], var.domain
                 end
             else
+                subplot := (i - 1) * (nin + nout) + j
                 grid --> false
                 axis --> false
                 legend --> false
                 ()
             end
         end
 
-        for (varname, var) in pairs(fis.outputs)
+        for (j, (varname, var)) in enumerate(pairs(fis.outputs))
             idx = findall(x -> subject(x) == varname, rule.consequent)
             length(idx) > 1 &&
                 throw(ArgumentError("Cannot plot repeated variables in rules"))
 
             @series if length(idx) == 1
+                subplot := (i - 1) * (nin + nout) + nin + j
                 rel = rule.consequent[first(idx)]
                 title := string(rel)
                 var.mfs[predicate(rel)], var.domain
             else
+                subplot := (i - 1) * (nin + nout) + nin + j
                 grid --> false
                 axis --> false
                 legend --> false
@@ -137,7 +147,7 @@ end
 
 @userplot GenSurf
 @recipe function f(plt::GenSurf;
-                   Npoints = 100)
+        Npoints = 100)
     fis = first(plt.args)
 
     if length(fis.inputs) > 2

test/test_plotting.jl

@@ -70,7 +70,7 @@ end
         (TriangularMF(10, 15, 20), dom_out),
         (GaussianMF(10.0, 1.5), dom_in),
         (TrapezoidalMF(7, 9, 10, 12), dom_in),
-        (TriangularMF(20, 25, 30), dom_out),
+        (TriangularMF(20, 25, 30), dom_out)
     ]
 
     titles = [
@@ -82,19 +82,19 @@ end
         "tip is average",
         "service is excellent",
         "food is delicious",
-        "tip is generous",
+        "tip is generous"
     ]
 
-    for (p, d, t) in zip(rec, data, titles)
+    for (i, (p, d, t)) in enumerate(zip(rec, data, titles))
         @test p.args == d
         if isempty(d)
             @test p.plotattributes == Dict(:plot_title => "tipper", :grid => false,
-                       :legend => false, :axis => false, :layout => (3, 3),
-                       :size => (900, 600))
+                :legend => false, :axis => false, :layout => (3, 3),
+                :size => (900, 600), :subplot => i)
         else
             @test p.plotattributes ==
                   Dict(:plot_title => "tipper", :size => (900, 600), :title => t,
-                       :layout => (3, 3))
+                :layout => (3, 3), :subplot => i)
         end
     end
 end
@@ -103,23 +103,25 @@ end
     mfnames = [:average, :generous]
     mfs = [
         ConstantSugenoOutput(15),
-        LinearSugenoOutput(Dictionary([:service, :food], [2.0, 0.5]), 5.0),
+        LinearSugenoOutput(Dictionary([:service, :food], [2.0, 0.5]), 5.0)
     ]
     var = Variable(Domain(0, 30), Dictionary(mfnames, mfs))
     plts = RecipesBase.apply_recipe(Dict{Symbol, Any}(), var, :tip)
     for (plt, mfname, mf) in zip(plts, mfnames, mfs)
         @test plt.args == (mf, Domain(0, 30))
         @test plt.plotattributes == Dict(:plot_title => "tip", :legend => false,
-                   :title => string(mfname), :layout => (1, 2))
+            :title => string(mfname), :layout => (1, 2))
     end
 end
 
 @testset "Plotting type-2 membership functions" begin
     mf = 0.5 * TriangularMF(1, 2, 3) .. TriangularMF(0, 2, 4)
-    plt = RecipesBase.apply_recipe(Dict{Symbol, Any}(), mf, 0, 4) |> only
-    @test plt.args[1](0.0) == mf.lo(0.0)
-    @test keys(plt.plotattributes) == Set([:fillrange, :legend, :fillalpha, :linealpha])
-    @test plt.plotattributes[:fillrange](0.0) == mf.hi(0.0)
+    plt = RecipesBase.apply_recipe(Dict{Symbol, Any}(), mf, 0, 4)
+    @test plt[1].args[1](0.0) == mf.lo(0.0)
+    @test keys(plt[1].plotattributes) ==
+          Set([:fillrange, :legend, :fillalpha, :linewidth, :linealpha])
+    @test plt[1].plotattributes[:fillrange](0.0) == mf.hi(0.0)
+    @test plt[2].args[1](2) == 1.0
 end
 
 # @testset "Plotting generating surface" begin