RubyGems - fuzzyrb - Versions diffs - 1.0.0 → 1.1.0 - Mend

fuzzyrb 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

data/History.txt +6 -0
data/Manifest.txt +4 -2
data/README.txt +1 -1
data/Rakefile +15 -8
data/index.html +12 -0
data/lib/fuzzy.rb +3 -3
data/lib/fuzzy_implication.rb +31 -0
data/lib/fuzzy_rule.rb +23 -12
data/lib/fuzzy_set.rb +46 -35
data/test/test_fuzzy.rb +2 -1
data/test/test_fuzzy_implication.rb +35 -0
data/test/test_fuzzy_rule.rb +18 -0
data.tar.gz.sig +0 -0
metadata +8 -5
metadata.gz.sig +0 -0
data/lib/fuzzy_inference.rb +0 -19
data/test/test_fuzzy_inference.rb +0 -27

data/History.txt CHANGED Viewed

@@ -1,3 +1,9 @@
+== 1.1.0 / 2007-11-15
+* Added Takegi-Sugeno rules
+* Added first minimum defuziffication method
+* Changed inference to implementation
+* Changed weightCenter to centerOfGravity
 == 1.0.0 / 2007-11-09
 * 1 major enhancement

data/Manifest.txt CHANGED Viewed

@@ -2,12 +2,14 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+index.html
 lib/fuzzy.rb
-lib/fuzzy_inference.rb
+lib/fuzzy_implication.rb
 lib/fuzzy_rule.rb
 lib/fuzzy_set.rb
 lib/line.rb
 lib/point.rb
 test/test_fuzzy.rb
-test/test_fuzzy_inference.rb
+test/test_fuzzy_implication.rb
+test/test_fuzzy_rule.rb
 test/test_fuzzy_set.rb

data/README.txt CHANGED Viewed

@@ -1,6 +1,6 @@
 fuzzyrb
     by Roman Kamyk
-    http://fuzzyrb.rubyforge.org/
+    http://rubyforge.org/projects/fuzzyrb/
 == DESCRIPTION:

data/Rakefile CHANGED Viewed

@@ -4,14 +4,21 @@ require 'rubygems'
 require 'hoe'
 require './lib/fuzzy.rb'
-Hoe.new('fuzzyrb', Fuzzyrb::VERSION) do |p|
-  p.rubyforge_name = 'fuzzyrb'
-  p.author = 'Roman Kamyk'
-  p.email = 'roman.kamyk@gmail.com'
-  p.summary = 'Fuzzy Sets for Ruby'
-  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+namespace :hoe do
+  Hoe.new('fuzzyrb', Fuzzyrb::VERSION) do |p|
+    p.rubyforge_name = 'fuzzyrb'
+    p.author         = 'Roman Kamyk'
+    p.email          = 'roman.kamyk@gmail.com'
+    p.summary        = 'Fuzzy Sets for Ruby'
+    p.description    = p.paragraphs_of('README.txt', 2..5).join("\n\n")
+    p.url            = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+    p.changes        = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  end
+end
+task :publish => ['hoe:release', 'hoe:post_news', 'hoe:publish_docs'] do
+  sh "svn ci -m '#{@changes}'"
+  sh "hg ci -m '#{@changes}'"
 end
 # vim: syntax=Ruby

data/index.html ADDED Viewed

@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>redirect</title>
+	<meta http-equiv="Refresh" content="1; URL=fuzzyrb/">
+</head>
+<body id="index">
+	Please see: <a href="http://fuzzyrb.rubyforge.org/fuzzyrb/">documentation</a>.
+</body>
+</html>

data/lib/fuzzy.rb CHANGED Viewed

@@ -22,8 +22,8 @@ require 'point'
 require 'line'
 require 'fuzzy_set'
 require 'fuzzy_rule'
-require 'fuzzy_inference'
+require 'fuzzy_implication'
 module Fuzzyrb
-  VERSION = "1.0.0"
-end
+  VERSION = "1.1.0"
+end

data/lib/fuzzy_implication.rb ADDED Viewed

@@ -0,0 +1,31 @@
+class FuzzyImplication
+  def initialize(rules)
+    @rules = rules
+  end
+end
+class TakagiSugenoImplication < FuzzyImplication
+  def evaluate(t_norm, values)
+    sum = 0
+    result = @rules.map { |rule|
+      rule.evaluate(t_norm, :takagiSugeno, values)
+    }.inject(0) { |s, rv| sum += rv[1]; s + rv[0] }
+    return 0 if sum == 0
+    result/sum
+  end
+end
+class MamdamiImplication < FuzzyImplication
+  def evaluate(t_norm, implication, defuzzification, values)
+    result = @rules.map { |rule|
+      rule.evaluate(t_norm, implication, values)
+    }.inject { |s, r| s + r }
+    if defuzzification == :CoG
+      return result.centerOfGravity
+    elsif defuzzification == :firstMin
+      return result.firstMinimum
+    else
+      raise Exception.new("Invalid deffuzification method")
+    end
+  end
+end

data/lib/fuzzy_rule.rb CHANGED Viewed

@@ -3,22 +3,33 @@ class FuzzyRule
     @arguments = arguments
     @result = result
   end
+  def evaluate(t_norm, implication, values)
+    if t_norm == :min
+      val = argumentsValues(values).min
+    elsif t_norm == :mult
+      val = argumentsValues(values).inject(1) { |mult, v| mult*v}
+    elsif
+      raise Exception.new("Invalid t_norm")
+    end
+    if implication == :mamdani
+      return @result.min(val)
+    elsif implication == :larsen
+      return @result.scale(val)
+    elsif implication == :takagiSugeno
+      #rule value and certainity
+      return [@result.call(values), val]
+    else
+      raise Exception.new("Invalid type")
+    end
+  end
-  def minOfArguments(values)
+  private
+  def argumentsValues(values)
     tmp = []
     for i in 0..(values.length-1)
       tmp << @arguments[i][values[i]]
     end
-    tmp.min
-  end
-  def larsen(values)
-    min = minOfArguments(values)
-    @result.scale(min)
-  end
-  def mandani(values)
-    min = minOfArguments(values)
-    @result.min(min)
+    tmp
   end
 end

data/lib/fuzzy_set.rb CHANGED Viewed

@@ -1,10 +1,6 @@
 EPSILON = 0.0001
 SCALE = 1
 class FuzzySet
-  def initialize(points)
-    @points = points.sort
-  end
   def self.trapezoid(array)
     raise Exception.new("Trapezoid must have array length 4") if array.length != 4
     points = []
@@ -14,38 +10,11 @@ class FuzzySet
     points << Point.new(array[3], 0)
     FuzzySet.new(points)
   end
-  def toLines
-    lines = []
-    for i in 1..@points.length-1
-      lines << Line.new(@points[i], @points[i-1])
-    end
-    lines
+  def initialize(points)
+    @points = points.sort
   end
-  def intersections(other)
-    if other.is_a?(Line)
-      points = []
-      toLines.each { |mline|
-        points << mline.intersect(other)
-      }
-      points.select { |point| (self[point.x]-point.y).abs <= EPSILON }
-    elsif other.is_a?(FuzzySet)
-      myLines = toLines
-      points = []
-      other.toLines.each { |line|
-        myLines.each { |mline|
-          points << mline.intersect(line)
-        }
-      }
-      points.select { |point|
-        (self[point.x]-point.y).abs + (other[point.x]-point.y).abs <= EPSILON
-      }
-    else
-      raise Exception.new("Unable to count intersection")
-    end
-  end
   def +(other)
     points = [@points, other.points, intersections(other)].flatten.uniq.sort
     res = points.reject { |point|
@@ -72,7 +41,7 @@ class FuzzySet
   end
   attr_reader :points
-  def weigthCenter()
+  def centerOfGravity()
     nominator = 0.0
     denominator = 0.0
     for i in 1..@points.length-1
@@ -85,6 +54,16 @@ class FuzzySet
     nominator/denominator
   end
+  def firstMinimum()
+    maxIdx = 0
+    for i in 0..@points.length-1
+      if @points[i].y > @points[maxIdx].y
+        maxIdx = i
+      end
+    end
+    @points[maxIdx].x
+  end
   def scale(factor)
     fs = FuzzySet.new(@points.map { |p| p.clone() })
     fs.scale!(factor)
@@ -112,4 +91,36 @@ class FuzzySet
     y2 = @points[idx].y
     return 1.0*(y2 - y1)/(x2-x1) * (value - x1) + y1
   end
+  def toLines
+    lines = []
+    for i in 1..@points.length-1
+      lines << Line.new(@points[i], @points[i-1])
+    end
+    lines
+  end
+  private
+  def intersections(other)
+    if other.is_a?(Line)
+      points = []
+      toLines.each { |mline|
+        points << mline.intersect(other)
+      }
+      points.select { |point| (self[point.x]-point.y).abs <= EPSILON }
+    elsif other.is_a?(FuzzySet)
+      myLines = toLines
+      points = []
+      other.toLines.each { |line|
+        myLines.each { |mline|
+          points << mline.intersect(line)
+        }
+      }
+      points.select { |point|
+        (self[point.x]-point.y).abs + (other[point.x]-point.y).abs <= EPSILON
+      }
+    else
+      raise Exception.new("Unable to count intersection")
+    end
+  end
 end

data/test/test_fuzzy.rb CHANGED Viewed

@@ -4,4 +4,5 @@ require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 require 'test_fuzzy_set'
-require 'test_fuzzy_inference'
+require 'test_fuzzy_rule'
+require 'test_fuzzy_implication'

data/test/test_fuzzy_implication.rb ADDED Viewed

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+require 'test/unit'
+require 'fuzzy'
+class TestFuzzyImplication < Test::Unit::TestCase
+  def setup
+    a11 = FuzzySet.trapezoid([4, 5, 5, 10])
+    a12 = FuzzySet.trapezoid([10, 19, 19, 20])
+    a21 = FuzzySet.trapezoid([4, 9, 9, 10])
+    a22 = FuzzySet.trapezoid([10, 12, 13, 20])
+    b1 = FuzzySet.trapezoid([20, 30, 30, 40])
+    b2 = FuzzySet.trapezoid([30, 45, 45, 50])
+    r1 = FuzzyRule.new([a11, a12], b1)
+    r2 = FuzzyRule.new([a21, a22], b2)
+    @fi = MamdamiImplication.new([r1, r2])
+    tr1 = FuzzyRule.new([a11, a12], Proc.new { |a, b| a+b })
+    tr2 = FuzzyRule.new([a21, a22], Proc.new { |a, b| a-b })
+    @tsi = TakagiSugenoImplication.new([tr1, tr2])
+  end
+  def test_mamdani
+    assert_in_delta 33.71, @fi.evaluate(:min, :mamdani, :CoG, [7, 18]), 0.005
+  end
+  def test_larsen
+    assert_in_delta 33.58, @fi.evaluate(:min, :larsen, :CoG, [7, 18]), 0.005
+  end
+  def test_takagi_sugeno
+    assert_equal 0, @tsi.evaluate(:min, [10, 20])
+    assert_equal 8.75, @tsi.evaluate(:min, [5, 19])
+  end
+end

data/test/test_fuzzy_rule.rb ADDED Viewed

@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+require 'test/unit'
+require 'fuzzy'
+class TestFuzzyRule < Test::Unit::TestCase
+  def setup
+    a11 = FuzzySet.trapezoid([4, 5, 5, 10])
+    a12 = FuzzySet.trapezoid([8, 10, 12, 20])
+    @rule = FuzzyRule.new([a11, a12], Proc.new {|a, b| a+b})
+  end
+  def test_larsen
+    assert_equal [25, 0.25], @rule.evaluate(:min, :takagiSugeno, [7, 18])
+    assert_equal [16, 1], @rule.evaluate(:min, :takagiSugeno, [5, 11])
+  end
+end

data.tar.gz.sig CHANGED Viewed

Binary file

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: fuzzyrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-date: 2007-11-10 00:00:00 +01:00
+  version: 1.1.0
+date: 2007-11-15 00:00:00 +01:00
 summary: Fuzzy Sets for Ruby
 require_paths:
 - lib
@@ -55,18 +55,21 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- index.html
 - lib/fuzzy.rb
-- lib/fuzzy_inference.rb
+- lib/fuzzy_implication.rb
 - lib/fuzzy_rule.rb
 - lib/fuzzy_set.rb
 - lib/line.rb
 - lib/point.rb
 - test/test_fuzzy.rb
-- test/test_fuzzy_inference.rb
+- test/test_fuzzy_implication.rb
+- test/test_fuzzy_rule.rb
 - test/test_fuzzy_set.rb
 test_files:
 - test/test_fuzzy.rb
-- test/test_fuzzy_inference.rb
+- test/test_fuzzy_implication.rb
+- test/test_fuzzy_rule.rb
 - test/test_fuzzy_set.rb
 rdoc_options:
 - --main

metadata.gz.sig CHANGED Viewed

Binary file

data/lib/fuzzy_inference.rb DELETED Viewed

@@ -1,19 +0,0 @@
-class FuzzyInference
-  def initialize(rules)
-    @rules = rules
-  end
-  def mandani(values)
-    result = @rules.map { |rule|
-      rule.mandani(values)
-    }.inject { |s, r| s + r }
-    result.weigthCenter
-  end
-  def larsen(values)
-    result = @rules.map { |rule|
-      rule.larsen(values)
-    }.inject { |s, r| s + r }
-    result.weigthCenter
-  end
-end

data/test/test_fuzzy_inference.rb DELETED Viewed

@@ -1,27 +0,0 @@
-#!/usr/bin/ruby
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-require 'test/unit'
-require 'fuzzy'
-class TestFuzzyInference < Test::Unit::TestCase
-  def setup
-    a11 = FuzzySet.trapezoid([4, 5, 5, 10])
-    a12 = FuzzySet.trapezoid([10, 19, 19, 20])
-    a21 = FuzzySet.trapezoid([4, 9, 9, 10])
-    a22 = FuzzySet.trapezoid([10, 12, 13, 20])
-    b1 = FuzzySet.trapezoid([20, 30, 30, 40])
-    b2 = FuzzySet.trapezoid([30, 45, 45, 50])
-    r1 = FuzzyRule.new([a11, a12], b1)
-    r2 = FuzzyRule.new([a21, a22], b2)
-    @fi = FuzzyInference.new([r1, r2])
-  end
-  def test_mandani
-    assert_in_delta 33.71, @fi.mandani([7, 18]), 0.005
-  end
-  def test_larsen
-    assert_in_delta 33.58, @fi.larsen([7, 18]), 0.005
-  end
-end