mini_kraken 0.3.01 → 0.3.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184cc99bd7696eb4f51fea822e74c98f42396f92cd47e1ce4501bed4cbb6a3c0
-  data.tar.gz: eb0bad624831f6643db7ec04265424cab58a9245f7fbfd472041e1eaa095de68
+  metadata.gz: aef8d438d839320f5a38af687cfef1e4018a687d5a9b3d071f5a485fa03cab3d
+  data.tar.gz: a8aefa5c850913634dbe5b28bec9c605782ef2ef7e8791632a9f7b504937442d
 SHA512:
-  metadata.gz: 3803703fc02bda7cee5cd72f511f1a4a32bfecb85663571c1b15f002ab82b7551e49654aea9ce3a12e06ffa7c4839999c9ae4df9ce3fd2f9ba679ff827d47541
-  data.tar.gz: 88bb32e2140526ee415542421ffad57ed768b67995c0a6d70b6c33d46f520b05ee312081b6d8a13ca64042ef004b0e7e2cf8baccbc226f385d0d67776220ac05
+  metadata.gz: 521fefadf00ba08606646afdd5f881a1a7bd4626221085c69adc2e822a2c2777b6fa28d71ea5f6541c614e0b8e9ca8470cab2301683d1c9f235bb1e3535f20f3
+  data.tar.gz: 99478f83ad99813aa29d82cef6cc5b8ad3d5df376d56819151ecc508d62f0a0fd23a62a1fb3553f8aa231e8c317ad5aa6930503b2cd8ff2951b6d94ca8b3480c

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.3.02] - 2020-12-19
+- `mini_kraken` now implements `conso` relation.
+
+### CHANGED
+- Method `Context#build_solution` old source code (redundant) removed.
+- File `README.md` minor changes.
+
+### FIXED
+- Method `ConsCell#expand` pushed a node in the stack even if it was fully visited.
+
 ## [0.3.01] - 2020-12-17
 - Minor: updated Rubocop config file `.rubocop.yml`
 

data/README.md

@@ -14,10 +14,10 @@ ISBN: 9780262535519, (2018), MIT Press.
 - Pure Ruby implementation, not a port from another language
 - Object-Oriented design
 - No runtime dependencies
-- Test suite patterned on the examples from the reference book.
+- Test suite patterned on examples from the reference book.
 
 ### miniKanren Features
-- [X] ==  
+- [X] ( == ) unify
 - [X] run\*  
 - [X] fresh
 - [X] conde
@@ -26,13 +26,13 @@ ISBN: 9780262535519, (2018), MIT Press.
 - [X] defrel  
 - [X] caro
 - [X] cdro
+- [X] conso 
 
 ### TODO
 
 - [ ] Occurs check
 
-List-centric relations from Chapter 2
-- [ ] conso  
+Pair-centric relations from Chapter 2 
 - [ ] nullo  
 - [ ] pairo  
 - [ ] singletono  

data/lib/mini_kraken/composite/cons_cell.rb

@@ -179,7 +179,7 @@ module MiniKraken
               new_cell = ConsCell.null
               if curr_cell
                 curr_cell.set!(side, new_cell)
-                path.push(curr_cell)
+                path.push(curr_cell) unless side == :cdr
               end
               curr_cell = new_cell
               head ||= new_cell

data/lib/mini_kraken/core/context.rb

@@ -239,138 +239,6 @@ module MiniKraken
       # Returns a Hash with pairs of the form:
       #   { String => Association }, or
       #   { String => AnyValue }
-      def build_zolution
-        clear_ranking
-        calc_ranking
-        solution = {}
-        return solution if failure?
-
-        # require 'debug'
-        symbol_table.root.defns.each_pair do |nm, item|
-          next unless item.kind_of?(LogVar)
-
-          if failure?
-            solution[nm] = nil
-            next
-          end
-          i_name = item.i_name
-          assocs = blackboard.associations_for(i_name, true)
-          if assocs.nil? || assocs.empty? ||
-             (blackboard.fused?(i_name) && assocs.empty?)
-            solution[nm] = AnyValue.new(ranking[i_name])
-          else
-            my_assocs = []
-            assocs.each { |a| my_assocs << a if a.kind_of?(Association) }
-            next if my_assocs.empty?
-
-            # TODO: if multiple associations, conj2 them...
-            as = my_assocs.first
-
-            deps = as.dependencies(self)
-            if deps.any? { |i_name_dep| ranking.include? i_name_dep }
-              # At least one dependent variable in expression is unbound
-              solution[nm] = substitute(as)
-            else
-              solution[nm] = as.value
-            end
-          end
-        end
-        # Take into current scope (e.g. x).
-        # e.g. if q depends on other inner scope variable,
-        # then one should replace every occurrence of x by AnyValue
-
-        solution
-      end
-=begin
-  find a solution for 1:67
-  Scope picture:
-  s_a:
-    q
-  ----
-  s_b:
-    x
-  ----
-  s_c:
-    y
-
-  Move_queue
-  bk(s_b)
-  bk(s_c)
-  assoc x => :split
-  assoc y => :pea
-  assoc r => '(,x ,y)
-
-  Let solution be a Hash i_name => value expression
-  Let substitutions be a Hash i_name => value expression
-  Start with root variables:
-    For each root variable:
-      Given q:
-      Is it unbound? N
-      Is it fused? N
-      Get its association (Assumption: one association only)
-      q => '( ,x ,y)
-      dependents:
-        Set { x, y}
-        Given x:
-          Is it unbound? N
-          Is it fused? N
-          Get its association
-          x => :split
-          no dependents => pinned, not a root variable:
-            Add x => :split in substitution
-            substitution = { x => :split }
-        Given y:
-          Is it unbound? N
-          Is it fused? N
-          Get its association
-          y => :pea
-          no dependents => pinned, not a root variable:
-            Add y => :pea in substitution
-            substitution = { x => :split, y => :pea }
-      All dependents resolved? Y
-      Add q => (:split :pea) to solution
-      Done with root variables?
-    Return solution: q => (split :pea)
-
-  Let solution be a Hash i_name => value expression
-  Let substitutions be a Hash i_name => value expression
-Method add_substitution_for(q, substitutions):
-  Is it already present in substitutions, then return
-
-  Is it unbound? N
-  Is it fused? N
-  Get its association (Assumption: one association only)
-    Assume q => '( ,x ,y)
-      with dependents: Set { x, y}
-        foreach dependent variable call
-          add_substitution_for(q, substitutions) # Recursive call
-      no dependents => pinned
-      Add association in substitution
-
-IDEA: placeholder in term expressions
-'( ,x ,y) is translated into:
-  cons(placeholder_100(nil), placeholder_200(nil))
-  x => [placeholder_100]
-  y => [placeholder_200]
-
-class Placeholder {
-  subj = nil
-  def object_id ; subj.object_id ; end
-  def kind_of? ; subj.kind_of? ; end
-  def to_s ; subj.to_s ; end
-}
-
-Where are placedholders created?
-- In Association.new
-
-Do we really need Placeholder?
-Do LogVarRef not fill the bill?
-IDEA: at a given moment, a LogVarRef is instructed to refer to a value
-Difficulty: A variable can take multiple values
-Thus the logVarRef may not embed the value but refer to a value indexed by solution.
-
-=end
-
       def build_solution
         solution = {}
         return solution if failure?

data/lib/mini_kraken/core/succeed.rb

@@ -19,7 +19,7 @@ module MiniKraken
       # When that object receives the message resume, it will
       # return a success context.
       # @param _actuals [Array] MUST be empty array for nullary relation.
-      # @param _ctx [Core::Context] Runtime context
+      # @param ctx [Core::Context] Runtime context
       # @return [Core::DuckFiber]
       def solver_for(_actuals, ctx)
         # Important: every `solver_for` call will result in a distinct Context.

data/lib/mini_kraken/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniKraken
-  VERSION = '0.3.01'
+  VERSION = '0.3.02'
 end

data/spec/core/context_spec.rb

@@ -31,11 +31,15 @@ module MiniKraken
         end
       end # context
 
-      context 'Initialization:' do
+      context 'Provided services:' do
         def var(aName)
           LogVar.new(aName)
         end
 
+        def cons(term1, term2 = nil)
+          Composite::ConsCell.new(term1, term2)
+        end
+
         it 'should accept the addition of an entry in symbol table' do
           subject.insert(var('x'))
           expect(subject.symbol_table).not_to be_empty
@@ -189,7 +193,7 @@ module MiniKraken
           expect(subject.send(:substitute, assoc_q).to_s).to eq('(_0 :foo . :bar)')
         end
 
-        it 'should build a solution' do
+        it 'should build a solution (atomic terms)' do
           subject.add_vars(%w[x y z])
 
           subject.succeeded!
@@ -215,6 +219,26 @@ module MiniKraken
           expect(sol['y']).to eq(bar)
           expect(sol['z']).to eq(:_0)
         end
+
+        it 'should build a solution (composite terms)' do
+          subject.add_vars(['l'])
+          new_scope = Scope.new
+          subject.enter_scope(new_scope)
+          a = k_symbol(:a)
+          b = k_symbol(:b)
+          c = k_symbol(:c)
+          subject.add_vars(['d'])
+          d_ref = LogVarRef.new('d')
+          subject.associate('l', cons(cons(a, cons(b)), d_ref))
+          subject.associate('d', cons(c))
+
+          subject.succeeded!
+          sol = subject.build_solution
+          expect(sol.size).to eq(1)
+
+          # TODO: fix next line. Actual is: ((a :c))
+          expect(sol['l'].to_s).to eq('((:a :b) :c)')
+        end
       end
     end # describe
   end # module

data/spec/glue/dsl_chap2_spec.rb

@@ -231,14 +231,14 @@ module MiniKraken
           #   (cdro p d))
 
           # As 'p' has a special meaning in Ruby, the argument has been remaned to 'r'
-          conso_rel = defrel('conso', %w[a r d], [caro(r, a), cdro(r, d)])
+          conso_rel = defrel('conso', %w[a d r], [caro(r, a), cdro(r, d)])
 
           expect(conso_rel).to be_kind_of(Rela::DefRelation)
           expect(conso_rel.name).to eq('conso')
           expect(conso_rel.arity).to eq(3)
           expect(conso_rel.formals[0]).to match(/^a_[-0-9a-f]+$/)
-          expect(conso_rel.formals[1]).to match(/^r_[-0-9a-f]+$/)
-          expect(conso_rel.formals[2]).to match(/^d_[-0-9a-f]+$/)
+          expect(conso_rel.formals[1]).to match(/^d_[-0-9a-f]+$/)
+          expect(conso_rel.formals[2]).to match(/^r_[-0-9a-f]+$/)
           g_template = conso_rel.expression
           expect(g_template.relation).to be_kind_of(Rela::Conj2)
           g1 = g_template.actuals[0]
@@ -255,7 +255,7 @@ module MiniKraken
         end
 
         # In Scheme:
-          # (defrel (conso a p d)
+          # (defrel (conso a d p)
           #   (caro  p a)
           #   (cdro p d))
         # In Ruby, `p`is a standard Kernel method => replace it by `r`
@@ -263,19 +263,87 @@ module MiniKraken
           defrel_caro
           defrel_cdro
 
-          defrel('conso', %w[a r d], [caro(r, a), cdro(r, d)])
+          # Definition derived from frame 2:25
+          # defrel('conso', %w[a d r], [caro(r, a), cdro(r, d)])
+
+          # Definition derived from frame 2:26
+          defrel('conso', %w[a d r], [unify(cons(a, d), r)])
+        end
+
+        it 'passes frame 2:19' do
+          defrel_conso
+
+          # (run* l
+          #   (conso '(a b c) '(d e) l)) ;; => (((a b c) d e))
+
+          result = run_star('l', conso(list(:a, :b, :c), list(:d, :e), l))
+          expect(result.to_s).to eq('(((:a :b :c) :d :e))')
+        end
+
+        it 'passes frame 2:20' do
+          defrel_conso
+
+          # (run* x
+          #   (conso x '(a b c) '(d a b c))) ;; => (d)
+
+          result = run_star('x', conso(x, list(:a, :b, :c), list(:d, :a, :b, :c)))
+          expect(result.to_s).to eq('(:d)')
+        end
+
+        it 'passes frame 2:21' do
+          defrel_conso
+
+          # (run* r
+          #   (fresh (x y z)
+          #     (== '(e a d ,x) r)
+          #     (conso y '(a ,z c) r))) ;; => ((e a d c)
+
+          expr = fresh(%w[x y z],
+            [unify(list(:e, :a, :d, x), r),
+              conso(y, list(:a, z, :c), r)])
+          result = run_star('r', expr)
+          expect(result.to_s).to eq('((:e :a :d :c))')
+        end
+
+        it 'passes frame 2:22' do
+          defrel_conso
+
+          # (run* x
+          #   (conso x '(a ,x c) '(d a ,x c))) ;; => (d)
+
+          result = run_star('x', conso(x, list(:a, x, :c), list(:d, :a, x, :c)))
+          expect(result.to_s).to eq('(:d)')
         end
 
-        # TODO: FIX THIS EXAMPLE
-        # it 'passes frame 2:19' do
-          # defrel_conso
+        it 'passes frame 2:23' do
+          defrel_conso
 
-          # # (run* l
-          # #   (conso '(a b c) '(d e) l)) ;; => ((abc) (d e))
+          # (run* l
+          #   (fresh (x)
+          #     (== '(d a ,x c) l)
+          #     (conso x '(a ,x c) l))) ;; => ((d a d c)
+
+          expr = fresh(%w[x],
+            [unify(list(:d, :a, x, :c), l),
+              conso(x, list(:a, x, :c), l)])
+          result = run_star('l', expr)
+          expect(result.to_s).to eq('((:d :a :d :c))')
+        end
+
+        it 'passes frame 2:24' do
+          defrel_conso
 
-          # result = run_star('l', conso( list(:a, :b, :c), list(:d, :e), l))
-          # expect(result.to_s).to eq('((:a :b :c) (:d :e))')
-        # end
+          # (run* l
+          #   (fresh (x)
+          #     (conso x '(a ,x c) l)))
+          #     (== '(d a ,x c) l) ;; => ((d a d c)
+
+          expr = fresh(%w[x],
+            [conso(x, list(:a, x, :c), l),
+              unify(list(:d, :a, x, :c), l)])
+          result = run_star('l', expr)
+          expect(result.to_s).to eq('((:d :a :d :c))')
+        end
       end # context
     end # describe
   end # module

data/spec/glue/run_star_expression_spec.rb

@@ -80,7 +80,7 @@ module MiniKraken
 
         # @return [Core::Goal]
         def fresh(names, subgoal)
-          puts "#{__callee__} #{names}"
+          # puts "#{__callee__} #{names}"
           if names.kind_of?(Array)
             k_names = names.map { |nm| Atomic::KString.new(nm) }
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_kraken
 version: !ruby/object:Gem::Version
-  version: 0.3.01
+  version: 0.3.02
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler