fuzzy-logic 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuzzy-logic (0.0.1)
+    fuzzy-logic (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -21,7 +21,72 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### A simple Fuzzy-Set
+
+    require 'fuzzy-logic'
+
+    its_near_christmas = FuzzyLogic::Set.new(1) { |time|
+      # default output is zero
+      o = 0.0
+      
+      # time has to be in december before or at the 24th
+      if time.month == 12 and time.day <= 24 then
+        # set is completly true when its 20th december or above
+        o = 1.0 if time.day >= 20
+
+        # set is fuzzy when its between 6th and 19th
+        o = 1.0 - (24.0 - time.day)/(24.0 - 6.0) if time.day >= 6 and time.day < 20.0
+      end
+
+      # just the correct return
+      o
+    }
+    
+    its_near_christmas.get( Time.now )
+    
+    its_near_christmas.support( Time.new(2013, 12, 8) ) # => true
+    its_near_christmas.support( Time.new(2013, 12, 6) ) # => false
+    
+    tis_near_christmas.core( Time.new(2013, 12, 23) )   # => true
+    its_near_christmas.core( Time.new(2013, 12, 8) )    # => false
+
+### Use Fuzzy-Generators
+
+The return is a normal Fuzzy-Set
+
+    require 'fuzzy-logic'
+    
+    # generate a triangle
+    triangle = FuzzyLogic::Generate.triangle(10, 4) # range is (8..12) and mid is 10 (8 and 12 is zero)
+    
+    # generate a trapezoid
+    trapez   = FuzzyLogic::Generate.trapezoid(10, 20, 30, 40) # ~support(10..40) and core(20..30)
+    
+    # combinations
+    triangle_and_trapez = FuzzyLogic::Generate.and(triangle, trapez)
+    triangle_or_trapez  = FuzzyLogic::Generate.or( triangle, trapez)
+    not_in_trapez       = FuzzyLogic::Generate.not( trapez )
+
+### Use Fuzzy-Collection
+
+    require 'fuzzy-logic'
+    
+    temp = FuzzyLogic::Collection.new("temperature in °C") { |testvalue|
+      o = true
+      if not testvalue.is_a? Numeric then
+        o = false
+      elsif testvalue > 100 or testvalue < -100 then
+        o = false
+      end
+      o
+    }
+    
+    temp[:hot] = FuzzyLogic::Generate.trapezoid(25, 35, 100, 101)
+    temp[:cold] = FuzzyLogic::Generate.trapezoid(-101, -100, 5, 15)
+    temp[:cool_to_warm] = FuzzyLogic::Generate.and( FuzzyLogic::Generate.not(temp[:hot]), FuzzyLogic::Generate.not(temp[:cold]))
+
+    temp.get(20)
+    # => { :cool_to_warm => 1.0 }
 
 ## Contributing
 

data/lib/fuzzy-logic/generate.rb

@@ -65,6 +65,48 @@ module FuzzyLogic
       args_test_array_filled_with_arrays_length(args, "Arguments of a list fuzzy-set should be Arrays of length 2", 2)
     end
 
+    def self.or(seta, setb, soft=false)
+      raise ArgumentError, "Arguments should be fuzzy-sets" unless seta.is_a? Set and setb.is_a? Set
+      
+      h1 = seta.height || 0
+      h2 = setb.height || 0
+      
+      hmax = [h1,h2].max
+      hmax = hmax > 0 ? hmax : nil
+
+      if soft then
+        return Set.new(hmax) { |n|
+          seta.get(n) + setb.get(n) - seta.get(n) * setb.get(n)
+        }
+      end
+
+      return Set.new(hmax) { |n|
+        [seta.get(n), setb.get(n)].max
+      }
+    end
+
+    def self.and(seta, setb, soft=false)
+      raise ArgumentError, "Arguments should be fuzzy-sets" unless seta.is_a? Set and setb.is_a? Set
+
+      if soft then
+        return Set.new { |n|
+          seta.get(n) * setb.get(n)
+        }
+      end
+
+      return Set.new { |n|
+        [seta.get(n), setb.get(n)].min
+      }
+    end
+
+    def self.not(seta)
+      raise ArgumentError, "Argument should be a fuzzy-set" unless seta.is_a? Set
+
+      return Set.new { |n|
+        1 - seta.get(n)
+      }
+    end
+
     private
 
     def self.args_test_array_filled_with_arrays_length(args, msg, len)

data/lib/fuzzy-logic.rb

@@ -34,5 +34,5 @@ require_relative "fuzzy-logic/generate.rb"
 require_relative "fuzzy-logic/collection.rb"
 
 module FuzzyLogic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fuzzy-logic/generate_spec.rb

@@ -72,4 +72,111 @@ describe FuzzyLogic::Generate do
   describe "a list fuzzy-set" do
     # no test yet - no architecture ...
   end
+
+  describe "combination of fuzzy-sets" do
+    before do
+      @seta = FuzzyLogic::Generate.trapezoid(10,20,30,40)
+      @setb = FuzzyLogic::Generate.trapezoid(30,40,50,60)
+    end
+
+    describe "or-combination" do
+      before do
+        @set_or = FuzzyLogic::Generate.or(@seta, @setb)
+        @set_or_soft = FuzzyLogic::Generate.or(@seta, @setb, true)
+      end
+
+      it "should raise an ArgumentError on Arguments, which are not a Set" do
+        lambda { FuzzyLogic::Generate.or(@seta, 1) }.must_raise ArgumentError
+        lambda { FuzzyLogic::Generate.or(:test, @setb) }.must_raise ArgumentError
+      end
+
+      it "should have a height of one" do
+        @set_or.height.must_equal 1
+        @set_or_soft.height.must_equal 1
+      end
+
+      it "should return a fuzzy-set" do
+        FuzzyLogic::Generate.or(@seta, @setb).must_be :is_a?, FuzzyLogic::Set
+      end
+
+      it "should have values of one" do
+        [20, 25, 30, 40, 45, 50].each { |i|
+          @set_or.get(i).must_equal 1
+        }
+      end
+
+      it "should have values of zero" do
+        [0, 5, 10, 60, 65, 70].each { |i|
+          @set_or.get(i).must_equal 0
+        }
+      end
+
+      it "should have values between one and zero" do
+        [11,15,19,31,35,39,51,59].each { |i|
+          @set_or.get(i).must_be :>, 0
+          @set_or.get(i).must_be :<, 1
+        }
+      end
+
+      it "can handle a soft mode" do
+        @set_or_soft.get(35).must_be :>, 0.5
+        @set_or_soft.get(35).must_equal 0.75
+      end
+    end
+
+    describe "and-combination" do
+      before do
+        @set_and = FuzzyLogic::Generate.and(@seta, @setb)
+        @set_and_soft = FuzzyLogic::Generate.and(@seta, @setb, true)
+      end
+
+      it "should raise an ArgumentError on Arguments, which are not a Set" do
+        lambda { FuzzyLogic::Generate.and(@seta, 1) }.must_raise ArgumentError
+        lambda { FuzzyLogic::Generate.and(:test, @setb) }.must_raise ArgumentError
+      end
+
+      it "should return a fuzzy-set" do
+        FuzzyLogic::Generate.and(@seta, @setb).must_be :is_a?, FuzzyLogic::Set
+      end
+
+      it "should have values with 0.5/0.25" do
+        @set_and.get(35).must_equal 0.5
+        @set_and_soft.get(35).must_equal 0.25
+      end
+
+      it "should have values with 0" do
+        [20,30,40,50].each { |i|
+          @set_and.get(i).must_equal 0
+          @set_and_soft.get(i).must_equal 0
+        }
+      end
+
+      it "should have values between 0 and 0.5" do
+        (31..39).to_a.each { |i|
+          @set_and.get(i).must_be :>, 0
+          @set_and.get(i).must_be :<=, 0.5
+        }
+      end
+    end
+
+    describe "not-combination" do
+      before do
+        @set_not = FuzzyLogic::Generate.not(@seta)
+      end
+
+      it "should raise an ArgumentError when argument is not a Set" do
+        lambda { FuzzyLogic::Generate.not(1) }.must_raise ArgumentError
+      end
+
+      it "should return a fuzzy-set" do
+        FuzzyLogic::Generate.not(@seta).must_be :is_a?, FuzzyLogic::Set
+      end
+
+      it "should be the oposite (1-val)" do
+        (0..100).to_a.each { |i|
+          @set_not.get(i).must_equal (1 - @seta.get(i))
+        }
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-logic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &82009770 !ruby/object:Gem::Requirement
+  requirement: &85026750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82009770
+  version_requirements: *85026750
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &82009510 !ruby/object:Gem::Requirement
+  requirement: &85026490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.8.8
   type: :development
   prerelease: false
-  version_requirements: *82009510
+  version_requirements: *85026490
 description: fuzzy-logic and fuzzy-rules are really handy for some problems.
 email:
 - ae@writedown.eu