stamina-core 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.6.1 / 2012-10-16
+
+* Fixed a bug in TransitionSystem::Equivalence that did not take non complete mapping into
+  account.
+* Fixed a bug in Automaton#complete when the alphabet is empty.
+* Fixed a bug in Automaton#to_dot when sort_states is false and no rewriter is passed.
+
 # 0.6.0 / 2012-09-12
 
 * Added Markable#marks and Markable#raw_data

data/lib/stamina-core/stamina/automaton.rb

@@ -863,7 +863,7 @@ module Stamina
     #
     def to_dot(sort_states = true, &rewriter)
       unless rewriter
-        to_dot do |elm, kind|
+        to_dot(sort_states) do |elm, kind|
           case kind
             when :automaton
               {:pack => true, :rankdir => "LR", :ranksep => 0, :margin => 0}

data/lib/stamina-core/stamina/automaton/complete.rb

@@ -28,7 +28,8 @@ module Stamina
           connect(s, sink, symbol)
         end
       end
-      drop_state(sink) if sink.adjacent_states == [sink]
+      adj = sink.adjacent_states
+      drop_state(sink) if adj.empty? or adj == [sink]
       self
     end
 

data/lib/stamina-core/stamina/transition_system/equivalence.rb

@@ -63,7 +63,9 @@ module Stamina
           symbol   = edge.symbol
           source   = reference.ith_state(deco)
           eq_edge  = algo.find_edge_counterpart(source, edge)
-          algo.fail("No such transition `#{symbol}` from #{source}") unless eq_edge
+          unless eq_edge
+            algo.fail("No such transition `#{symbol}` from #{source}")
+          end
           algo.equivalent_edges!(edge, eq_edge)
           algo.equivalent_states!(edge.target, eq_edge.target)
           eq_edge.target.index
@@ -89,8 +91,9 @@ module Stamina
           fail "No initial state on ts1" unless i1
           fail "No initial state on ts2" unless i2
           equivalent_states!(i1, i2)
-          EquivThroughDeco.new(ts2, self).call(ts1, {})
-          return true
+          mapping = {}
+          EquivThroughDeco.new(ts2, self).call(ts1, mapping)
+          return !mapping.any?{|k,v| v.nil?}
         end
         return false
       ensure

data/lib/stamina-core/stamina/utils.rb

@@ -1 +1,2 @@
-require_relative 'utils/decorate'
+require_relative 'utils/decorate'
+require_relative 'utils/aggregator'

data/lib/stamina-core/stamina/utils/aggregator.rb

@@ -0,0 +1,45 @@
+module Stamina
+  module Utils
+    class Aggregator
+
+      def initialize
+        @functions = {}
+        @default   = nil
+        yield(self) if block_given?
+      end
+      attr_reader :functions
+
+      def register(key, function = nil, &bl)
+        functions[key] = function || bl
+      end
+
+      def default(function = nil, &bl)
+        @default = function || bl
+      end
+
+      def ignore(key)
+        register(key, lambda{|v1,v2| throw :ignore })
+      end
+
+      def merge(t1, t2)
+        tuple = {}
+        t1.keys.each do |k|
+          next unless fn = functions[k] || @default
+          catch :ignore do
+            tuple[k] = fn.call(t1[k], t2[k])
+          end
+        end
+        tuple
+      end
+
+      def aggregate(enum)
+        memo = nil
+        enum.each do |tuple|
+          memo = memo ? merge(memo, tuple) : tuple
+        end
+        memo
+      end
+
+    end # class Aggregator
+  end # module Utils
+end # module Stamina

data/lib/stamina-core/stamina/version.rb

@@ -3,7 +3,7 @@ module Stamina
 
     MAJOR = 0
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stamina-core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &70185698728600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70185698728600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.3
 description: ! "Stamina is an automaton and regular inference toolkit initially developped
   for the \nbaseline of the Stamina Competition (stamina.chefbe.net)."
 email:
@@ -66,6 +71,7 @@ files:
 - lib/stamina-core/stamina/sample.rb
 - lib/stamina-core/stamina/transition_system/equivalence.rb
 - lib/stamina-core/stamina/transition_system.rb
+- lib/stamina-core/stamina/utils/aggregator.rb
 - lib/stamina-core/stamina/utils/decorate.rb
 - lib/stamina-core/stamina/utils.rb
 - lib/stamina-core/stamina/version.rb
@@ -82,9 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -57027985138010278
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,8 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Automaton and Regular Inference Toolkit
 test_files: []
+has_rdoc: