fuzzyrb 1.2.2 → 1.2.3

data/History.txt

@@ -1,3 +1,7 @@
+== 1.2.3 / 2007-11-22
+
+* MamdaniImplication fixed (minimum was computed badly)
+
 == 1.2.2 / 2007-11-19
 
 * Bugfix: little changes in test, so now they can be run in any of the ways:

data/Rakefile

@@ -27,4 +27,10 @@ task :default => ["hoe:test"] do
   puts "Use rake -T to see avalaible options."
 end
 
+task :stats do
+  require 'rubygems'
+  gem 'rails'
+  require 'code_statistics'
+  CodeStatistics.new(["Code", "lib/"], ["Unit tests", "test/"]).to_s
+end
 # vim: syntax=Ruby

data/examples/compare_models.rb

@@ -39,6 +39,8 @@
 # 
 # Without uncomenting this line 3dplot seems not to work.
 
+# TODO: Problem with Mamdani, t_norm = mult, defuzz = firstMaximum
+
 $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'fuzzy'
 include Fuzzyrb
@@ -68,42 +70,53 @@ rescue LoadError
   @makePlot = false
   STDERR.puts "If you want to see graphical output you have to install gnuplot from Rubyforge!"
 end
-@sum_of_diffs = {}
+@ssd = {}
+
+def plot(x, y, z, title)
+  Gnuplot.open do |gp|
+    Gnuplot::SPlot.new( gp ) do |plot|
+      plot.title  title
+      plot.xlabel "a"
+      plot.ylabel "b"
+      plot.set("ticslevel", "0.8")
+      plot.set("isosample", "40,40")
+
+      plot.data << Gnuplot::DataSet.new( [x, y, z] ) do |ds|
+        ds.with = "pm3d"       
+      end
+    end
+  end
+end
+
 def count_error(implication, params)
   range = 0..10
   x = range.collect {|v| v.to_f}
   y = x
-  z = []
-  pp params
-  for i in range do
-    z << []
-    for j in range do
+  systems = []
+  diffs = []
+  # pp params
+  for i in x do
+    systems << []
+    diffs << []
+    for j in y do
       # print " T_Norm: #{t_norm}, implication: #{imp_type}, deffuzification: #{def_type}, difference: "
       res = implication.evaluate([i, j],params)
-      diff = (res - (i+j)).abs
-      @sum_of_diffs[params] ||= 0
-      @sum_of_diffs[params] += diff
-      puts "[#{i}, #{j}] #{res} - #{i+j} = #{res - (i+j)}"
-      z[i] << diff
+      diff = (res - (i+j))
+      @ssd[params] ||= 0
+      @ssd[params] += diff * diff
+      # puts "[#{i}, #{j}] #{res} - #{i+j} = #{res - (i+j)}"
+      diffs[i] << diff
+      systems[i] << res
     end
   end
   if @makePlot
-    Gnuplot.open do |gp|
-      Gnuplot::SPlot.new( gp ) do |plot|
-        plot.title  "#{params.inspect}"
-        plot.xlabel "a"
-        plot.ylabel "b"
-        plot.set("ticslevel", "0.8")
-        plot.set("isosample", "40,40")
-
-        plot.data << Gnuplot::DataSet.new( [x, y, z] ) do |ds|
-          ds.with = "pm3d"       
-        end
-      end
-    end
+    plot(x, y, diffs, "ROZNICE #{params.inspect} #{@ssd[params] / (range.last-range.first + 1)**2 }")
+    plot(x, y, systems, "SYSTEM #{params.inspect}")
   end
 end
 
+# count_error(@ms, :t_norm => :mult, :implication => :mamdani, :defuzzification => :firstMaximum)
+# exit
 [:min, :mult].each do |t_norm|
   count_error(@tss, :t_norm => t_norm, :implication => :takegiSugeno)
   [:mamdani, :larsen].each do |imp_type|
@@ -112,4 +125,4 @@ end
     end
   end
 end
-pp @sum_of_diffs
+# pp @ssd

data/lib/fuzzy.rb

@@ -56,5 +56,5 @@ require 'fuzzy_rule'
 require 'fuzzy_implication'
 
 module Fuzzyrb
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/fuzzy_set.rb

@@ -25,7 +25,7 @@ module Fuzzyrb
 
     def min(value)
       line = Line.new(Point.new(0, value), Point.new(1, value))
-      points = [@points, intersections(line)].flatten.uniq_values.sort
+      points = [@points, intersections(line)].flatten.uniq_values.sort.map { |p| Point.new(p.x, [p.y, value].min)}
       # reject all points that has higher membership than this fuzzy set
       res = points.reject { |p| self[p.x] - EPSILON > value }
       FuzzySet.new(res)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: fuzzyrb
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2007-11-19 00:00:00 +01:00
+  version: 1.2.3
+date: 2008-01-22 00:00:00 +01:00
 summary: Fuzzy Sets for Ruby
 require_paths: 
 - lib
@@ -94,5 +94,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.0
     version: