prop_logic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37cd959dffbbeeb64bde6b241794bec73c4415a6
-  data.tar.gz: 3a836ab88dd8e721b0e10ed4f1d0d7ffdb93fdd1
+  metadata.gz: 5e6c98eb22a2749c09f37c1e6d696a8fd579b841
+  data.tar.gz: 9899d1f4ca58451e53382c9087cddb41dc10cbbe
 SHA512:
-  metadata.gz: 50f268b87efd5333fcbffbe2e72a48e13e87c25ed79e12d570f37043e692dae4d5eb02d9e7291e1262ee26e18509e0274dc018a801fb4d62ad60b4f2c214e37f
-  data.tar.gz: 1c74a4734264ed6395a0eba5806e03902c138b65f2ddc45551f01e9fd2ad36aa2f6e1ead12006749e4af542c064c015339f40853cf8ac6eefae0b4d46b40660f
+  metadata.gz: 3b7a05895cf515208b136022a18464b176ce25ca246f4f783b6af01da4c56a92c859b94d8039f2d2a78167d2260639f682f0782235b2cb21ad5aeb97de638b40
+  data.tar.gz: 6b63a27d59cd559090f9d119819bbbdabcf1b49a21004974fdc31c53990d9f6bd88eebe30c05320417353f4d3a06cd2f98258efbceb356c156cf0842bbdb28ce

data/.travis.yml

@@ -6,4 +6,7 @@ rvm:
   - 2.0.0
   - rbx-3.9
   - jruby-9.0.1.0
+matrix:
+  allow_failures:
+    - rvm: rbx-3.9
   

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Ver. 0.1.1 (2016/01/28)
+- `PropLogic.all_and`/`PropLogic.all_or` with less than one argument(s) behaviors fixed
+- And/or terms with duplicated subterms are no longer regarded as reduced 
+
+# Ver. 0.1.0 (2016/01/27)
+Initial version

data/README.md

@@ -84,7 +84,11 @@ NNF doesn't contain following terms:
 `#nnf?` checks if the term is NNF, and `#to_nnf` returns term converted to NNF.
 
 #### Reduction
-Term is regarded as reduced if it is NNF and it contains no constants (`PropLogic::True`/`PropLogic::False`).
+Term is regarded as reduced if:
+0. it is NNF
+0. it contains no constants (`PropLogic::True`/`PropLogic::False`)
+0. it contains no ambivalent terms
+0. it contains no duplicated terms
 
 `#reduced?` checks if the term is reduced, and `#reduce` returns reduced term.
 

data/lib/prop_logic/and_term.rb

@@ -15,6 +15,11 @@ module PropLogic
         end
       end
       return unless @is_reduced
+      # check duplication of terms
+      if @terms.any?{ |term| @terms.index(term) != @terms.rindex(term)}
+        @is_reduced = false
+        return
+      end
       # check contradicted variables (mark as unreduced)
       # Negated terms (except variables) doesn't come here
       not_terms = @terms.select{ |t| t.is_a?(NotTerm) }
@@ -37,7 +42,7 @@ module PropLogic
     
     def reduce
       return self if reduced?
-      reduced_terms = @terms.map(&:reduce)
+      reduced_terms = @terms.map(&:reduce).uniq
       reduced_terms.reject!{|term| term.equal?(True)}
       return True if reduced_terms.empty?
       if reduced_terms.any?{|term| term.equal?(False)}

data/lib/prop_logic/or_term.rb

@@ -14,6 +14,11 @@ module PropLogic
         end
       end
       return unless @is_reduced
+      # check duplication of terms
+      if @terms.any?{ |term| @terms.index(term) != @terms.rindex(term)}
+        @is_reduced = false
+        return
+      end
       # check obvious variables (mark as unreduced)
       # Negated terms (except variables) doesn't come here
       not_terms = @terms.select{ |t| t.is_a?(NotTerm) }
@@ -36,7 +41,7 @@ module PropLogic
     
     def reduce
       return self if reduced?
-      reduced_terms = @terms.map(&:reduce)
+      reduced_terms = @terms.map(&:reduce).uniq
       reduced_terms.reject!{|term| term.equal?(False)}
       return False if reduced_terms.empty?
       if reduced_terms.any?{|term| term.equal?(True)}

data/lib/prop_logic/term.rb

@@ -76,6 +76,7 @@ module PropLogic
     end
     
     def self.validate_terms(*terms)
+      raise ArgumentError, 'no terms given' if terms.empty?
       terms.map do |term|
         case term
         when TrueClass
@@ -90,11 +91,14 @@ module PropLogic
       end
     end
     
+    private_class_method :validate_terms
+    
     def self.get(klass, *terms)
       @table ||= Ref::WeakValueMap.new
       terms = validate_terms(*terms)
       if klass == AndTerm || klass == OrTerm
         terms = terms.map{|t| t.is_a?(klass) ? t.terms : t}.flatten
+        return terms[0] if terms.length == 1
       end 
       key = klass.name + terms.map(&:object_id).join(',')
       return @table[key] if @table[key]

data/lib/prop_logic/version.rb

@@ -1,3 +1,3 @@
 module PropLogic
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop_logic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jkr2255
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref
@@ -17,8 +17,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,8 +45,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,8 +59,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Propositional logic for Ruby