prop_logic 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9157db3af14631a810dee1098d90a7c952c67278
-  data.tar.gz: ec391493ffe55fadc12b6bf77d550ea840025b31
+  metadata.gz: 1dfd97019313a0cf9368c49fc535084abe18637b
+  data.tar.gz: 2679c35cd7dbf22235bd92b670077c3f57a64e98
 SHA512:
-  metadata.gz: 5f46a0567cc5991360038a1ce802db01346741baa99f0b66bae4eedd3f266b23f98b3f7e28531566ef009582e0d57a97617fcd19ddc1a34c9d5db0ac5bd8b2e3
-  data.tar.gz: 181b998494156523c584640146a062af319f98316b254f6ef79fe2bfa6280ae5d7d4685777bfc9270a005ae642b1b79e5b62efbf754289c76b7b09a3a28286b0
+  metadata.gz: 78b0d8ad6a92ec447534f42eb6a6ceee63778f74a7d4466079f9f35f0efe2824e26421b8b0000a98473f9209147956381ff4e8a1de753d964c2d895f14017c3a
+  data.tar.gz: d6c09dce76e172d687c5420b5aa4847ec789282fc40b5daf9f775cfbbf3410bca8723ea0ca549bc55df6aff0f0da3adbb3c1d00f15031a3cad889d4414bd5cae

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Ver. 0.2.3 (2016/04/06)
+- Inprove performance in negating variables
+- Optionally select normal Hash for caching
+
 # Ver. 0.2.2 (2016/04/04)
 - Improve performance in `AndTerm`/`OrTerm` generation
 

data/README.md

@@ -54,6 +54,11 @@ diff = (~a | ~b).equiv?(~(a & b)) # true
 (a & b).assign_true(a).assign_false(b).reduce # PropLogic::False
 ```
 
+### Using normal Hash for caching
+By default, `prop_logic` uses weak reference for caching terms, allowing garbage collection.
+
+If this is inappropriate (overhead or unstability), use `require 'prop_logic/hash_cache'` to use `Hash` for caching.
+
 ## Restriction
 SAT solver bundled with this gem is brute-force solver (intended only for testing), so it is inappropriate to use for
 real-scale problems.
@@ -61,6 +66,8 @@ real-scale problems.
 In CRuby and Rubinius, bindings to MiniSat ([jkr2255/prop_logic-minisat](https://github.com/jkr2255/prop_logic-minisat)) is available.
 It is a plugin for this gem, so no code (except require and Gemfile) needs to be changed to use `prop_logic-minisat`.
 
+In JRuby binding to Sat4j ([jkr2255/prop_logic-sat4j](https://github.com/jkr2255/prop_logic-sat4j)) is available.
+
 ## References
 `PropLogic::Term` is immutable, meaning that all calculations return new Terms.
 ### `PropLogic::Term` instance methods

data/lib/prop_logic/hash_cache.rb

@@ -0,0 +1,8 @@
+require 'prop_logic'
+
+# monkey-patching cache generation
+class PropLogic::Term
+  def self.generate_cache
+    {}
+  end
+end

data/lib/prop_logic/term.rb

@@ -102,13 +102,14 @@ module PropLogic
 
     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
+    def self.generate_cache
+      Ref::WeakValueMap.new
+    end
+
+    private_class_method :generate_cache
+
+    def self.cached(klass, *terms)
+      @table ||= generate_cache
       key = klass.name + terms.map(&:object_id).join(',')
       return @table[key] if @table[key]
       ret = klass.__send__ :new, *terms
@@ -118,6 +119,17 @@ module PropLogic
       ret.freeze
     end
 
+    private_class_method :cached
+
+    def self.get(klass, *terms)
+      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
+      cached klass, *terms
+    end
+
     # check if this term is a cnf term.
     # @return [Boolean] false unless overridden.
     def cnf?

data/lib/prop_logic/variable.rb

@@ -45,5 +45,16 @@ module PropLogic
         self
       end
     end
+
+    # bypassing Term.get
+    # @return [NotTerm] negated variable
+    def not
+      Term.__send__ :cached, NotTerm, self
+    end
+
+    alias_method :~, :not
+    alias_method :-@, :not
+
+
   end
 end

data/lib/prop_logic/version.rb

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

metadata

@@ -1,66 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: prop_logic
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jkr2255
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-06 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'
-  type: :runtime
+  name: ref
   prerelease: false
+  type: :runtime
   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'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -89,6 +89,7 @@ files:
 - lib/prop_logic/constants.rb
 - lib/prop_logic/default_incremental_solver.rb
 - lib/prop_logic/functions.rb
+- lib/prop_logic/hash_cache.rb
 - lib/prop_logic/not_term.rb
 - lib/prop_logic/or_term.rb
 - lib/prop_logic/sat_solver.rb
@@ -101,7 +102,7 @@ homepage: https://github.com/jkr2255/prop_logic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,9 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Propositional logic for Ruby
 test_files: []