weel 1.99.36 → 1.99.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2af90ba047268e2a5317dc15e26dffca388d683
-  data.tar.gz: 1f0bfae2da2dc2f4991b34805067f2c9b590419c
+  metadata.gz: 32e1005b0f41f52946b44912e80015f710b8c7c1
+  data.tar.gz: 55aba746487938da392df037239b3e9c67078c63
 SHA512:
-  metadata.gz: 9143e9304fb52498936ffeb66792c449124b8274143cb0de61a8587a5bf26645f3f437d054c1d6124bf40d7c976fb8cbbdb05c460d4ac329ae9fe3c88024fe76
-  data.tar.gz: 4f78372a234a78035c9602cfc56b8e1447a3168008bccb9ada4a624c0a96f25cad13984a91c8c770a5eb2b7de642961cbe3aca6a985c45fb06a6c4ad5efca7d6
+  metadata.gz: 8c2318a70fe3c7de7bc8c5c182877ce3ff53648c0c3bffc2d46104d3815f983c3eee5b06c8303ce4328209cb6a48f0d92734863cf593811f147005cc9884fa1e
+  data.tar.gz: 121d51d53524c67784417ab80ee5bf8154cceff2588bde7eccd8f9c3ff54ce00037c07af2fe866630c0582f393392134034ef444a337fced3269ef9dc37479ed

data/Changelog

@@ -2,7 +2,7 @@
 -----
 
 * Ruby >= 1.9.3 only, use Queue instead of Threads and Mutexes of Weel::Continue
-* LGPL-3 to achive Aapache 2 compatibility
+* LGPL-3 to achive Apache 2 compatibility
 * Raise Weel::Signal::Again in HandlerWrapper, to trigger Manipulation and then
 redo the activity. HandlerWrapper is not discarded inbetween, so it is possible
 to continue receiving multiple callbacks. Basically sequential multi instance

data/lib/weel.rb

@@ -338,16 +338,17 @@ class WEEL
       yield
 
       Thread.current[:branch_wait_count] = (type.is_a?(Hash) && type.size == 1 && type[:wait] != nil && (type[:wait].is_a?(Integer) && type[:wait] > 0) ? type[:wait] : Thread.current[:branches].size)
+      1.upto Thread.current[:branches].size do
+        Thread.current[:branch_event].wait
+      end  
+
       Thread.current[:branches].each do |thread| 
-        while thread.status != 'sleep' && thread.alive?
-          Thread.pass
-        end
         # decide after executing block in parallel cause for coopis
         # it goes out of search mode while dynamically counting branches
         if Thread.current[:branch_search] == false
           thread[:branch_search] = false
         end  
-        thread.wakeup if thread.alive?
+        thread[:start_event].continue
       end
 
       Thread.current[:branch_event].wait
@@ -380,24 +381,23 @@ class WEEL
       end  
 
       Thread.current[:branches] << Thread.new(*vars) do |*local|
-        branch_parent[:mutex].synchronize do
-          Thread.current.abort_on_exception = true
-          Thread.current[:branch_status] = false
-          Thread.current[:branch_parent] = branch_parent
+        Thread.current.abort_on_exception = true
+        Thread.current[:branch_status] = false
+        Thread.current[:branch_parent] = branch_parent
+        Thread.current[:start_event] = Continue.new
 
-          if __weel_sim
-            Thread.current[:branch_sim_pos] = @__weel_sim += 1
-          end  
-
-          # parallel_branch could be possibly around an alternative. Thus thread has to inherit the alternative_executed
-          # after branching, update it in the parent (TODO)
-          if branch_parent[:alternative_executed] && branch_parent[:alternative_executed].length > 0
-            Thread.current[:alternative_executed] = [branch_parent[:alternative_executed].last]
-            Thread.current[:alternative_mode] = [branch_parent[:alternative_mode].last]
-          end
+        if __weel_sim
+          Thread.current[:branch_sim_pos] = @__weel_sim += 1
         end  
 
-        Thread.stop
+        # parallel_branch could be possibly around an alternative. Thus thread has to inherit the alternative_executed
+        # after branching, update it in the parent (TODO)
+        if branch_parent[:alternative_executed] && branch_parent[:alternative_executed].length > 0
+          Thread.current[:alternative_executed] = [branch_parent[:alternative_executed].last]
+          Thread.current[:alternative_mode] = [branch_parent[:alternative_mode].last]
+        end
+        branch_parent[:branch_event].continue
+        Thread.current[:start_event].wait
 
         if __weel_sim
           handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args

data/test/complexsearch/tc_search.rb

@@ -0,0 +1,16 @@
+require 'test/unit'
+require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
+
+class TestAdventureSearch < Test::Unit::TestCase
+  include TestMixin
+
+  def test_search_adventure
+    @wf.data[:oee] = 0.25
+    @wf.description = File.read(::File.dirname(__FILE__) + '/dsl1')
+    @wf.search [WEEL::Position.new(:a2, :at), WEEL::Position.new(:a13, :at)]
+    @wf.start.join
+
+    wf_assert("DONE a2",true)
+    wf_assert("DONE a13",true)
+  end
+end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.36"
+  s.version          = "1.99.37"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.36
+  version: 1.99.37
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
@@ -18,52 +18,53 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
-- example/SimpleHandlerWrapper.rb
-- example/SimpleWorkflow.rb
-- example/runme.rb
-- lib/weel.rb
+- AUTHORS
 - COPYING
 - Changelog
 - FEATURES
 - INSTALL
-- Rakefile
-- weel.gemspec
 - README
-- AUTHORS
-- test/SimHandlerWrapper.rb
-- test/TestMixin.rb
-- test/TestHandlerWrapper.rb
+- Rakefile
+- example/SimpleHandlerWrapper.rb
+- example/SimpleWorkflow.rb
+- example/runme.rb
+- lib/weel.rb
 - test/ContinueTest.rb
 - test/README
+- test/SimHandlerWrapper.rb
+- test/TestHandlerWrapper.rb
+- test/TestMixin.rb
 - test/TestWorkflow.rb
-- test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_multimerge.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_threadmerge.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
-- test/wfp_iteration/tc_structuredloop.rb
+- test/basic/tc_choose.rb
 - test/basic/tc_codereplace.rb
+- test/basic/tc_data.rb
 - test/basic/tc_endpoint.rb
 - test/basic/tc_handler.rb
 - test/basic/tc_parallel.rb
 - test/basic/tc_search.rb
 - test/basic/tc_state.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_data.rb
 - test/basic/tc_wf_control.rb
-- test/exec/tc_exec.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/complex/tc_parallel_stop.rb
+- test/complexsearch/tc_search.rb
 - test/exec/tc_again.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/exec/tc_exec.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_threadsplit.rb
 - test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/wfp_basic/tc_sequence.rb
+- test/wfp_iteration/tc_structuredloop.rb
 - test/wfp_state_based/tc_deferredchoice.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/complex/tc_parallel_stop.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- weel.gemspec
 homepage: http://cpee.org/
 licenses:
 - LGPL-3
@@ -84,42 +85,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
 test_files:
-- test/SimHandlerWrapper.rb
-- test/TestMixin.rb
 - test/TestHandlerWrapper.rb
+- test/SimHandlerWrapper.rb
 - test/ContinueTest.rb
+- test/TestMixin.rb
 - test/README
 - test/TestWorkflow.rb
-- test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_multimerge.rb
-- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_threadmerge.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
-- test/wfp_iteration/tc_structuredloop.rb
+- test/complex/tc_parallel_stop.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/wfp_state_based/tc_deferredchoice.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/wfp_basic/tc_sequence.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/basic/tc_data.rb
 - test/basic/tc_codereplace.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_handler.rb
-- test/basic/tc_parallel.rb
-- test/basic/tc_search.rb
 - test/basic/tc_state.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_data.rb
 - test/basic/tc_wf_control.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_search.rb
+- test/basic/tc_handler.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_parallel.rb
+- test/wfp_iteration/tc_structuredloop.rb
+- test/complexsearch/tc_search.rb
 - test/exec/tc_exec.rb
 - test/exec/tc_again.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
-- test/wfp_state_based/tc_deferredchoice.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/complex/tc_parallel_stop.rb
+- test/wfp_adv_branching/tc_threadsplit.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_localsynchronizingmerge.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
+- test/wfp_adv_branching/tc_multimerge.rb