rubylog 2.0.1 → 2.1.0

data/spec/spec_helper.rb

@@ -15,3 +15,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   
 end
+
+module RubylogSpec
+  extend Rubylog::Context
+end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubylog
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &79320110 !ruby/object:Gem::Requirement
+  requirement: &1 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79320110
+  version_requirements: *1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79319690 !ruby/object:Gem::Requirement
+  requirement: &2 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: '3'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *79319690
+  version_requirements: *2
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &79319150 !ruby/object:Gem::Requirement
+  requirement: &3 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,43 +46,66 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *79319150
+  version_requirements: *3
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &79318590 !ruby/object:Gem::Requirement
+  requirement: &4 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *79318590
+  version_requirements: *4
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &79318130 !ruby/object:Gem::Requirement
+  requirement: &5 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *79318130
+  version_requirements: *5
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &79317710 !ruby/object:Gem::Requirement
+  requirement: &6 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79317710
+  version_requirements: *6
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &7 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *7
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &8 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *8
 description: Rubylog is a Prolog-like DSL for Ruby.
 email: kallo.bernat@gmail.com
-executables: []
+executables:
+- rubylog
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -98,39 +121,28 @@ files:
 - Rakefile
 - TODO.txt
 - VERSION
+- benchmark/benchmark.rb
+- benchmark/benchmark/compiled_not_indexed.rb
+- benchmark/benchmark/compiled_sequence_indexed.rb
+- benchmark/benchmark/indexed_procedure.rb
+- benchmark/benchmark/prolog.rb
+- benchmark/benchmark/pure.rb
+- bin/rubylog
 - examples/a_plus_b.rb
-- examples/benchmark.rb
-- examples/benchmark/compiled_not_indexed.rb
-- examples/benchmark/compiled_sequence_indexed.rb
-- examples/benchmark/indexed_procedure.rb
-- examples/benchmark/prolog.rb
-- examples/benchmark/pure.rb
-- examples/checkmate.rb
-- examples/combination.rb
 - examples/dcg.rb
 - examples/dcg2.rb
-- examples/directory_structure_logic.rb
-- examples/dirlist.rb
 - examples/divisors.rb
-- examples/enumerators.rb
 - examples/factorial.rb
 - examples/file_search.rb
 - examples/hanoi.rb
-- examples/hello.rb
 - examples/hu/csaladfa.rb
-- examples/mice.rb
-- examples/mice2.rb
 - examples/n_queens.rb
-- examples/object_oriented.rb
 - examples/palindrome_detection.rb
 - examples/parsing.rb
 - examples/permutation.rb
-- examples/prefix.rb
 - examples/primality_by_division.rb
-- examples/primitives.rb
 - examples/sieve_of_eratosthenes.rb
 - examples/string_interpolation.rb
-- examples/sudoku.rb
 - examples/tracing.rb
 - lib/rspec/rubylog.rb
 - lib/rubylog.rb
@@ -171,6 +183,7 @@ files:
 - lib/rubylog/predicate.rb
 - lib/rubylog/primitive.rb
 - lib/rubylog/procedure.rb
+- lib/rubylog/rubylog_files.rb
 - lib/rubylog/rule.rb
 - lib/rubylog/structure.rb
 - lib/rubylog/term.rb
@@ -247,8 +260,6 @@ files:
 - spec/inriasuite_spec.rb
 - spec/integration/custom_classes_spec.rb
 - spec/integration/dsl_spec.rb
-- spec/integration/theory_as_module_spec.rb
-- spec/integration/theory_as_module_with_include_spec.rb
 - spec/rspec/rubylog_spec.rb
 - spec/rubylog/assertable_spec.rb
 - spec/rubylog/builtins/arithmetics_spec.rb
@@ -290,16 +301,16 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 393356129
+      hash: -992188621
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/examples/benchmark/pure.rb

@@ -1,26 +0,0 @@
-# encoding: UTF-8
-require "rubylog"
-extend Rubylog::Context
-
-predicate_for $person_class, ".parent_of() .grandparent_of()"
-
-def make_tree(parent, levels)
-  return if levels.zero?
-
-  children = (1..DEGREES).map{random_person} 
-
-  children.each do |child|
-    # add relationship
-    parent.parent_of!(child)
-  end
-
-  children.each do |child|
-    # make sub-tree
-    make_tree(child, levels-1)
-  end 
-end 
-
-make_tree(random_person, LEVELS)
-
-A.grandparent_of(B).if A.parent_of(X).and X.parent_of(B)
-

data/examples/checkmate.rb

@@ -1,88 +0,0 @@
-require "rubylog"
-
-
-rubylog do
-  predicate_for Array, ".on()"
-
-  black, white = 0, 1
-  pawn,rook,knight,bishop,queen,king = :pawn, :rook, :knight, :bishop, :queen, :king
-
-  mark = :mark
-
-  signs = {pawn: "p", rook:"r", knight:"n", bishop:"b", queen:"q", king:"k", mark:"x"}
-
-  [black,pawn]  .on! [5,7]
-  [black,bishop].on! [8,1]
-  [black,pawn]  .on! [8,5]
-  [black,king]  .on! [8,6]
-
-  [white,pawn]  .on! [1,7]
-  [white,king]  .on! [1,8]
-  [white,bishop].on! [2,8]
-  [white,pawn]  .on! [3,7]
-  [white,pawn]  .on! [5,5]
-  [white,pawn]  .on! [6,6]
-  [white,knight].on! [6,8]
-  [white,bishop].on! [7,2]
-  [white,pawn]  .on! [7,7]
-  [white,pawn]  .on! [8,4]
-
-  predicate ":show"
-
-  :show.if do
-    (R_.in(1..8).and(R.is{9-R_})).each do
-      F.in(1..8).each do
-        print '.' unless prove [C,P].on([F,R]).and :cut!.and { print C==white ? signs[P].upcase : signs[P]; true }
-      end
-      puts
-    end
-    puts
-    true
-  end
-
-  functor_for Rubylog::Structure, :attacks, :can_move_to
-  functor_for Integer, :rook_move, :bishop_move, :squares, :squares_forward
-  prefix_functor :knight_move, :pawn_attack, :pawn_move
-
-
-  [C,king    ].on(S).can_move_to(S1).if   1.  rook_move(S,S1).or 1.bishop_move(S,S1)
-  [C,queen   ].on(S).can_move_to(S1).if ANY.  rook_move(S,S1).or ANY.bishop_move(S,S1)
-  [C,bishop  ].on(S).can_move_to(S1).if ANY.bishop_move(S,S1)
-  [C,knight  ].on(S).can_move_to(S1).if     knight_move(S,S1)
-  [C,rook    ].on(S).can_move_to(S1).if ANY.  rook_move(S,S1)
-
-  [white,pawn].on(S).can_move_to(S1).if       pawn_move(S,S1)
-  [black,pawn].on(S).can_move_to(S1).if       pawn_move(S1,S)
-  [white,pawn].on([F,2]).can_move_to!([F,4])
-  [black,pawn].on([F,7]).can_move_to!([F,5])
-
-  [white,pawn].on(S).attacks(S1).if! pawn_attack(S,S1)
-  [black,pawn].on(S).attacks(S1).if! pawn_attack(S1,S)
-  X.attacks(S1).if X.can_move_to(S1)
-
-
-  N.squares_forward(A[1..8],B[1..8]).if B.is(A,:+,N)
-  N.squares(A,B).if A.in(1..8).and B.in(1..8).and B.is(A,:+,N).or A.is(B,:+,N)
-
-  N.  rook_move([F ,R1],[F ,R2]).if N.squares(R1,R2)
-  N.  rook_move([F1,R ],[F2,R ]).if N.squares(F1,F2)
-  N.bishop_move([F1,R1],[F2,R2]).if N.squares(R1,R2).and N.squares(F1,F2)
-
-  knight_move([F1,R1],[F2,R2]).if((1.squares(F1,F2).and 2.squares(R1,R2))
-                               .or(1.squares(R1,R2).and 2.squares(F1,F2)))
-  pawn_move(  [F ,R1],[F ,R2]).if 1.squares_forward(R1,R2)
-  pawn_attack([F1,R1],[F2,R2]).if R2.is(R1,:+,1).and 1.squares(F1,F2)
-
-
-  functor_for Rubylog::Structure, :moved_to
-
-  [C,P].on(S).moved_to(S1).if [C,P].on(S).and [C,P].on(S).can_move_to(S1).and [C,P].on(S).revoked.and [C,P].on(S1).assumed
-
-  solve :show.and [C,P].on(S).moved_to(S1).and{ puts "#{C} #{P}: #{S} -> #{S1}"; true}.and :show
-
-
-
-
-
-
-end

data/examples/combination.rb

@@ -1,17 +0,0 @@
-require "rubylog"
-extend Rubylog::Context
-
-predicate_for Array, ".choose(,,)"
-predicate_for Integer, ".one_less_than()"
-
-N.one_less_than(M).if M.sum_of(N,1)
-
-L.choose!(0,[],L)
-[A,*REST].choose(N[thats>0],CHOSEN,[A,*REM]).if REST.choose(N,CHOSEN,REM)
-[A,*REST].choose(N[thats>0],[A,*CHOSEN],REM).if N1.one_less_than(N).and REST.choose(N1,CHOSEN,REM)
-
-[1,2,3,4,5].choose(3,L,ANY).each do
-  L.choose(1,[A],REM).each do
-    puts "#{A}: #{REM}"
-  end
-end

data/examples/directory_structure_logic.rb

@@ -1,17 +0,0 @@
-require "rubylog"
-
-rubylog do
-  predicate_for String, ".dir", ".contains()"
-
-  ".git".dir!.contains! "Git repository"
-  "bin".dir!.contains! "executables"
-  "examples".dir!.contains! "examples and ideas for different applications of Rubylog"
-  "lib".dir!.contains! "source code of Rubylog"
-  "spec".dir!.contains! "functional tests written in RSpec"
-  "logic".dir!.contains! "integration tests written in Rubylog"
-
-  gitignore = File.readlines(".gitignore").map{|l| l.chop}
-  check X.in(Y.dir.map{Y}).iff(X.in(Y.dirname_in(".").and(Y.not_in(gitignore)).map{Y}))
-
-end
-

data/examples/dirlist.rb

@@ -1,4 +0,0 @@
-require "rubylog"
-extend Rubylog::Context
-
-

data/examples/enumerators.rb

@@ -1,30 +0,0 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require 'rubylog'
-
-rubylog do
-  self.default_subject = Symbol
-  predicate ".likes()"
-
-  :john.likes! :beer
-  :john.likes! :milk
-  :john.likes! :water
-
-  :jane.likes! :milk
-  :jane.likes! :water
-
-  :jeff.likes! :water
-  :jeff.likes! :milk
-  :jeff.likes! :juice
-
-  check A.likes(:beer).all A.likes(:water)
-  check A.likes(:beer).any A.likes(B).and B.is_not :water
-  check A.likes(:milk).iff A.likes(:water)
-  check A.likes(:beer).iff A.is(:john)
-
-  check all(X.likes(:juice), X.likes(:beer).false)
-  check any(X.likes(:water), X.likes(:juice))
-  check one(X.likes :juice)
-  check one(X.likes :milk).false
-  check none(X.likes :palinka)
-  check iff A.likes(:milk), A.likes(:water)
-end

data/examples/hello.rb

@@ -1,17 +0,0 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-
-require 'rubylog'
-
-
-rubylog do
-  predicate_for String, ".written :hello"
-
-  X.written.if {puts X; true}
-
-  :hello.if "Hello world!".written
-end
-
-rubylog do
-  solve :hello
-end
-

data/examples/mice.rb

@@ -1,92 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift File.dirname(__FILE__)+"/../lib"
-# This is a solution for a math problem.
-#
-# Mafia the black cat plays a game. She has N cups with 0 or 1 mouse under each.
-# She peeks under some cups one by one to see if there is a mouse under them.
-# What she wants to find out is whether there are two cups next to each other
-# which both have a mouse. She found that for some number of cups she has to
-# peek under every cup to decide if there are two adjacent ones with a mouse.
-# In this case she considers the task hard. For which N's does she consider it
-# hard (N<=2013)?
-
-require "rubylog"
-require "rubylog/builtins/assumption"
-extend Rubylog::Context
-
-
-class Cup < Struct.new :i
-  extend Rubylog::Context
-
-  def inspect
-    "##{i}"
-  end
-
-  # A cup can be peeked: it has mouse or not
-  predicate %w(.peeked .has_mouse .seen )
-  C.peeked.if C.has_mouse.assumed.or(:true).and C.seen.assumed
-
-  # A cup can be guessed: it has mouse or not
-  predicate %w(.guessed)
-  C.guessed.if C.has_mouse.assumed.or(:true)
-
-end
-
-
-class CupSet
-  extend Rubylog::Context
-
-  def initialize n
-    @cups = (1..n).map {|i| Cup.new i }
-  end
-
-  def each &block
-    @cups.each &block
-  end
-
-  def [] index
-    @cups[index]
-  end
-
-  # A set has neighbors if 
-  predicate %w(.has_neighbors)
-  CS.has_neighbors.if [C,D].in{CS[0..-2].zip(CS[1..-1] || [])}.and C.has_mouse.and D.has_mouse
-
-  # A predicate definitely solves a set if there is no ambiguity
-  predicate_for Rubylog::Goal, %w(.definitely_solves())
-  T.definitely_solves(CS).if T.any(CS.has_neighbors).and(T.any(CS.has_neighbors.false)).false
-
-  # A trial consist of peeking some cups
-  predicate_for Rubylog::Goal, %w(.trial_for())
-  T.trial_for(CS).if T.is{C.in(CS).map{C.peeked.or :true}.inject(:true,&:and)}.and T
-
-  # A set is easy if can be definitely solved by a trial that has not seen all
-  # cups. A set is had if it cannot.
-  predicate %w(.easy() .hard)
-  CS.easy(Peeks).if any T.trial_for(CS).and(C.in(CS).all(C.seen).false).definitely_solves(CS).and(Peeks.is{D.in(CS).and(D.peeked).map{D}})
-  CS.hard.if CS.easy.false
-
-end
-
-
-N.in(0..4).each do
-  puts "#{N}:"
-  CS.is{CupSet.new(N)}.each do
-
-    C.in{CS}.each { p C }
-    T.trial_for(CS).each { p T }
-
-    easy = false
-    CS.easy(Peeks).each do
-      puts "easy: #{Peeks.inspect}"
-      easy = true
-    end
-    puts "hard" if not easy
-  end
-  puts
-end
-
-
-
-
-