prop_logic 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dfd97019313a0cf9368c49fc535084abe18637b
-  data.tar.gz: 2679c35cd7dbf22235bd92b670077c3f57a64e98
+  metadata.gz: a458a1f8cc633e600ce0b2e39d591dcae2455932
+  data.tar.gz: a83d16bf8e6cbc6025b4f940e1ef3b7dab93e308
 SHA512:
-  metadata.gz: 78b0d8ad6a92ec447534f42eb6a6ceee63778f74a7d4466079f9f35f0efe2824e26421b8b0000a98473f9209147956381ff4e8a1de753d964c2d895f14017c3a
-  data.tar.gz: d6c09dce76e172d687c5420b5aa4847ec789282fc40b5daf9f775cfbbf3410bca8723ea0ca549bc55df6aff0f0da3adbb3c1d00f15031a3cad889d4414bd5cae
+  metadata.gz: e71e1608080cad1e400d6a278153544b6619c62694e1de5efc66946277f8452bf84e4879b69996d1098bee792eef5294a31ff0712b23e9424c3cb9e295d130f5
+  data.tar.gz: 6b3689179f39190f23787936f05e86cddead26c3f96a62738b0c7072464ed52ad7bdbacb32f793e15a477d4dc842f46f20c33ff558d2a9189af3288ab96247b8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Ver. 0.2.4 (2016/04/09)
+- Using Scrutinizer for code quality
+- Performance improvements
+
 # Ver. 0.2.3 (2016/04/06)
 - Inprove performance in negating variables
 - Optionally select normal Hash for caching

data/README.md

@@ -1,6 +1,8 @@
 # PropLogic
 
 [![Build Status](https://travis-ci.org/jkr2255/prop_logic.svg?branch=master)](https://travis-ci.org/jkr2255/prop_logic)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jkr2255/prop_logic/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jkr2255/prop_logic/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/jkr2255/prop_logic/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/jkr2255/prop_logic/?branch=master)
 [![Gem Version](https://badge.fury.io/rb/prop_logic.svg)](https://badge.fury.io/rb/prop_logic)
 
 PropLogic implements propositional logic in Ruby, usable like normal variables.

data/lib/prop_logic/and_term.rb

@@ -1,30 +1,8 @@
 module PropLogic
   class AndTerm < Term
     def initialize(*terms)
-      @terms = terms.map{|t| t.is_a?(AndTerm) ? t.terms : t}.flatten.freeze
-      @is_nnf = @terms.all?(&:nnf?)
-      # term with negative terms are no longer terated as reduced
-      @is_reduced = @is_nnf && @terms.all? do |term|
-        if term.is_a?(Constant) || !term.reduced?
-          false
-        elsif !(term.is_a?(NotTerm))
-          true
-        else
-          # NotTerm
-          term.terms[0].is_a?(Variable)
-        end
-      end
-      return unless @is_reduced
-      # check duplication of terms
-      if @terms.length != @terms.uniq.length
-        @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) }
-      negated_variales = not_terms.map{|t| t.terms[0]}
-      @is_reduced = false unless (negated_variales & @terms).empty?
+      @terms = terms.map { |t| t.is_a?(AndTerm) ? t.terms : t }.flatten.freeze
+      check_nnf_reduced
     end
 
     def to_s(in_term = false)

data/lib/prop_logic/not_term.rb

@@ -2,6 +2,8 @@ module PropLogic
   class NotTerm < Term
     def initialize(term)
       @terms = [term].freeze
+      @is_nnf = @terms[0].is_a?(Variable)
+      @is_reduced = @is_nnf && ! (@terms[0].is_a?(Constant))
     end
 
     def to_s(*)
@@ -9,7 +11,7 @@ module PropLogic
     end
 
     def nnf?
-      @terms[0].is_a?(Variable)
+      @is_nnf
     end
 
     def to_nnf
@@ -29,7 +31,7 @@ module PropLogic
     end
 
     def reduced?
-      nnf? && ! (@terms[0].is_a?(Constant))
+      @is_reduced
     end
 
     def reduce

data/lib/prop_logic/or_term.rb

@@ -2,28 +2,7 @@ module PropLogic
   class OrTerm < Term
     def initialize(*terms)
       @terms = terms.map{|t| t.is_a?(OrTerm) ? t.terms : t}.flatten.freeze
-      @is_nnf = @terms.all?(&:nnf?)
-      @is_reduced = @is_nnf && @terms.all? do |term|
-        if term.is_a?(Constant) || !(term.reduced?)
-          false
-        elsif !(term.is_a?(NotTerm))
-          true
-        else
-          # NotTerm
-          term.terms[0].is_a?(Variable)
-        end
-      end
-      return unless @is_reduced
-      # check duplication of terms
-      if @terms.length != @terms.uniq.length
-        @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) }
-      negated_variales = not_terms.map{|t| t.terms[0]}
-      @is_reduced = false unless (negated_variales & @terms).empty?
+      check_nnf_reduced
     end
 
     def to_s(in_term = false)

data/lib/prop_logic/term.rb

@@ -189,5 +189,34 @@ module PropLogic
       ((self | other) & (~self | ~other)).unsat?
     end
 
+    private
+
+    # checking methods
+
+    def check_term_uniqueness
+      @is_reduced &&= (@terms.length == @terms.uniq.length)
+    end
+
+    def check_ambivalent_vars
+      return unless @is_reduced
+      term_by_class = @terms.group_by(&:class)
+      return if term_by_class[NotTerm].nil? || term_by_class[Variable].nil?
+      negated_variales = term_by_class[NotTerm].map { |t| t.terms[0] }
+      @is_reduced = false unless (negated_variales & term_by_class[Variable]).empty?
+    end
+
+    def check_nnf_reduced
+      @is_reduced = true
+      @is_nnf = @terms.all? do |term|
+        @is_reduced &&= !term.is_a?(Constant) && term.reduced?
+        @is_reduced &&= !term.is_a?(NotTerm) || term.terms[0].is_a?(Variable)
+        next true if @is_reduced
+        term.nnf?
+      end
+      return unless @is_reduced
+      check_term_uniqueness
+      check_ambivalent_vars
+    end
+
   end
 end

data/lib/prop_logic/version.rb

@@ -1,3 +1,3 @@
 module PropLogic
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/prop_logic.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  
+
   spec.add_dependency "ref", '~> 2.0'
   spec.required_ruby_version = '>= 2.0.0'
 
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", '~> 3.0'
-  # spec.add_development_dependency "pry-byebug", '~> 3.3'
+  spec.add_development_dependency "scrutinizer-ocular", '~> 1.0'
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: prop_logic
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jkr2255
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ref
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: ref
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: scrutinizer-ocular
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Write propositional logic formulae using Ruby DSL.
 email:
 - magnesium.oxide.play@gmail.com
@@ -102,7 +116,7 @@ homepage: https://github.com/jkr2255/prop_logic
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -117,9 +131,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: Propositional logic for Ruby
 test_files: []