fuzzy-logic 0.0.2 → 0.0.3

data/README.md

@@ -65,7 +65,14 @@ The return is a normal Fuzzy-Set
     # combinations
     triangle_and_trapez = FuzzyLogic::Generate.and(triangle, trapez)
     triangle_or_trapez  = FuzzyLogic::Generate.or( triangle, trapez)
-    not_in_trapez       = FuzzyLogic::Generate.not( trapez )
+    not_in_trapez       = FuzzyLogic::Generate.not( trapez )           # not is just like this: Set.new { |n| 1 - trapez.get(n) }
+
+for combinations there are also helpers
+
+    # shortcut of combinations
+    triangle_and_trapez = triangle.and trapez
+    triangle_or_trapez  = triangle.or  trapez
+    not_in_trapez       = trapez.not
 
 ### Use Fuzzy-Collection
 
@@ -83,10 +90,14 @@ The return is a normal Fuzzy-Set
     
     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]))
+    
+    # or the short version
+    temp[:cool_2_warm] = temp[:hot].not.and temp[:cold].not
 
     temp.get(20)
-    # => { :cool_to_warm => 1.0 }
+    # => { :cool_to_warm => 1.0, :cool_2_warm => 1.0 }
 
 ## Contributing
 

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.2"
+  VERSION = "0.0.3"
 end

data/lib/fuzzy-logic/collection.rb

@@ -20,6 +20,10 @@ module FuzzyLogic
       @sets[fuzzysetname.to_sym] = fuzzyset
     end
 
+    def [](fuzzysetname)
+      @sets[fuzzysetname.to_sym]
+    end
+
     def get(n, all=false)
       raise TypeError, "Test of Fuzzy-Collection is not valid" unless [true, false].include? @test.call(n)
       raise ArgumentError, "Argument is not valid" unless @test.call(n)

data/lib/fuzzy-logic/set.rb

@@ -40,5 +40,17 @@ module FuzzyLogic
 
       return out
     end
+
+    def and(other)
+      FuzzyLogic::Generate.and(self, other)
+    end
+
+    def or(other)
+      FuzzyLogic::Generate.or(self, other)
+    end
+
+    def not
+      FuzzyLogic::Generate.not(self)
+    end
   end
 end

data/spec/fuzzy-logic/collection_spec.rb

@@ -43,6 +43,11 @@ describe FuzzyLogic::Collection do
       @collection.get(25).wont_be_empty
       @collection.get(0, true).wont_be_empty
     end
+    
+    it "should return a fuzzy-set on hash-indexing or nil if its not presence" do
+      @collection[:test].must_be :is_a?, FuzzyLogic::Set
+      @collection[:i_am_an_invalid_key].must_be_nil
+    end
 
     it "should be empty on 0" do
       @collection.get(0).must_be_empty

data/spec/fuzzy-logic/set_spec.rb

@@ -12,6 +12,10 @@ describe FuzzyLogic::Set do
       o
     }
 
+    @another_valid_set = FuzzyLogic::Set.new(1) { |n|
+      n > 10 ? 0.0 : 1.0
+    }
+
     @invalid_set = FuzzyLogic::Set.new(1) { |n|
       "i am invalid."
     }
@@ -135,4 +139,28 @@ describe FuzzyLogic::Set do
       @valid_set.core(29, 0.5).must_equal false
     end
   end
+
+  describe "add_helpers to every set" do
+    it "should have a helper for and generator" do
+      (0..40).to_a.each { |i|
+        @valid_set.and(@another_valid_set).get(i).must_equal FuzzyLogic::Generate.and(@valid_set, @another_valid_set).get(i)
+      }
+    end
+    it "should have a helper for or generator" do
+      (0..40).to_a.each { |i|
+        @valid_set.or(@another_valid_set).get(i).must_equal FuzzyLogic::Generate.or(@valid_set, @another_valid_set).get(i)
+      }
+    end
+    it "should have a helper for not generator" do
+      (0..40).to_a.each { |i|
+        @valid_set.not.get(i).must_equal FuzzyLogic::Generate.not(@valid_set).get(i)
+      }
+    end
+    it "can combined together" do
+      test_set = FuzzyLogic::Generate.and(FuzzyLogic::Generate.not(@valid_set), FuzzyLogic::Generate.not(@another_valid_set))
+      (0..40).to_a.each { |i|
+        @valid_set.not.and(@another_valid_set.not).get(i).must_equal test_set.get(i)
+      }
+    end
+  end
 end

metadata

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