wongi-engine 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046a3edb6e6950fdf204e986680485e598115937
-  data.tar.gz: c5c71da579f11287bf316ee0ecabfc3af6affa47
+  metadata.gz: 51fa3bdb2ee8d509f179b467564af30d9922b13a
+  data.tar.gz: 1736ff23ea8708629ef21ed3eb877fa39116f250
 SHA512:
-  metadata.gz: 1e0b329d153820ae40118ae0cbb4ee393b2bf5ba719ca52b48240e8e3d0ddfd3c2e32ba22ece4596097f8d96d4c037a38dc429f970993aea3c15d7c277335ae6
-  data.tar.gz: 45eda6aca07f7a5e7afb8bce48ed27515eab42879319908f00860bea61a4183dd901363f77895a822c865dd5a9cd9d32064f40d3e7f8d849746966fc3b4dd55d
+  metadata.gz: 40b30715a6e2b89e9a2a6ea4ce52a40ce48f3fc78860bd2ada3431ad45228c953590b8be25d3cdff66280bdd201837da8eaeb48934da0111a315d6fe7f6b6f91
+  data.tar.gz: bfc4f7e1d7e2b22cb8dac7d1845fcabdf069b3f0ba4786a2f9d8a9df5738d154b82cedb2f1ec1868690ecc12c1675bd46cfb46c54408d48ea9b1879e99df0e77

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
 - 2.2
 - 2.3.0
 - rbx-2.5.8
+- rbx-3.14
 - jruby-9.0
 sudo: false
 notifications:

data/lib/wongi-engine/beta/ncc_node.rb

@@ -42,16 +42,12 @@ module Wongi
       end
 
       def ncc_activate token
-        token.deleted = false
-        token.overlay.add_token(token, self)
         children.each do |child|
           child.beta_activate Token.new( child, token, nil, { } )
         end
       end
 
       def ncc_deactivate token
-        token.overlay.remove_token(token, self)
-        token.deleted!
         children.each do |beta|
           beta.tokens.select { |t| t.parent == token }.each do |t|
             beta.beta_deactivate t

data/lib/wongi-engine/beta/ncc_partner.rb

@@ -21,9 +21,11 @@ module Wongi
         token = tokens.find { |tok| tok.parent == t }
         return unless token
         token.overlay.remove_token(token, self)
-        token.owner.ncc_results.delete token
-        if token.owner.ncc_results.empty?
-          ncc.ncc_activate token.owner
+        if owner = token.owner
+          owner.ncc_results.delete token
+          if owner.ncc_results.empty?
+            ncc.ncc_activate owner
+          end
         end
       end
 

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/spec/bug_specs/issue_4_spec.rb

@@ -57,7 +57,7 @@ describe "issue 4" do
   end
 
   # cascaded processing affects this
-  it "should not retract later items from within a rule", :debug do
+  it "should not retract later items from within a rule" do
 
     engine = Wongi::Engine.create
 

data/spec/generation_spec.rb

@@ -47,7 +47,7 @@ describe Wongi::Engine::DSL::Action::StatementGenerator do
         engine << %w( Claire relative Dwight )
       end
 
-      it 'should be created', :debug do
+      it 'should be created' do
         expect( production ).to have(2).tokens
         expect( engine.find *%w( Alice relative Dwight ) ).not_to be_nil
       end

data/spec/rule_specs/assign_spec.rb

@@ -34,7 +34,7 @@ describe "ASSIGN rule" do
 
   end
 
-  it 'should be deactivatable', :debug do
+  it 'should be deactivatable' do
 
     prod = engine << rule {
       forall {

data/spec/rule_specs/maybe_rule_spec.rb

@@ -52,7 +52,7 @@ describe "MAYBE rule" do
 
   end
 
-  it 'should pass with retracted facts', :debug do
+  it 'should pass with retracted facts' do
 
     prod = engine << maybe_rule
 

data/spec/rule_specs/ncc_spec.rb

@@ -209,4 +209,55 @@ describe Wongi::Engine::NccNode do
 
   end
 
+  it 'should ncc-deactivate without destroying tokens' do
+    engine << rule {
+      forall {
+        has :Student, :is_a, :student
+        has :Course, :is_a, :course
+        none {
+          has :Requirement, :is_a, :requirement
+          has :Course, :Requirement, :RequiredGrade
+          any {
+            option {
+              neg :Student, :Requirement, :_
+            }
+            option {
+              has :Student, :Requirement, :ReceivedGrade
+              less :ReceivedGrade, :RequiredGrade
+            }
+          }
+        }
+      }
+      make {
+        gen :Student, :passes_for, :Course
+      }
+    }
+
+    File.open "rete.dot", "w" do |io|
+      Wongi::Engine::Graph.new( engine ).dot( io )
+    end
+
+
+    %w( math science english bio ).each { |req| engine << [ req, :is_a, :requirement ] }
+    %w( CourseA CourseB CourseC ).each  { |course| engine << [ course, :is_a, :course ] }
+    engine << [ "StudentA", :is_a, :student ]
+
+    engine << ["CourseA", "math", 50]
+    engine << ["CourseA", "science", 50]
+
+    engine << ["CourseB", "math", 50]
+    engine << ["CourseB", "english", 50]
+
+    engine << ["CourseC", "math", 50]
+    engine << ["CourseC", "bio", 50]
+
+    engine << ["StudentA", "math", 60]
+    engine << ["StudentA", "science", 60]
+    engine << ["StudentA", "bio", 40]
+
+    expect(engine.find "StudentA", :passes_for, "CourseA").not_to be_nil
+    expect(engine.find "StudentA", :passes_for, "CourseB").to be_nil
+    expect(engine.find "StudentA", :passes_for, "CourseC").to be_nil
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.