dither 0.1.3-java → 0.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60b932856e4303b3e27b8440d86a0ed05cc4d755
-  data.tar.gz: 0e24393afd97c6e8f30e26b2d04c8e7d25f9d077
+  metadata.gz: 3af620c3811276969244eb515443a6f89bce71c8
+  data.tar.gz: f40ebd686325b3d402f3e752cb9db9fcaca4074f
 SHA512:
-  metadata.gz: de5da737c601465568461255abc3f964d411e7379a2f1a227bc536b812a6e030bcbb224d037a57920c34631d74e11f49abedce0dc7c4c159831c0cd066d05143
-  data.tar.gz: bd5db6700ce111013b4b624b4c092307ea7f8bf351fd3a72ac0983ba5586868d19e04f57f77f6cf77b83f0af6d4d24ae2a83b790369686c8124003739abbdc7e
+  metadata.gz: 36ef90323fdb4264d5f183fd203adc0a7ed7d12e7cf5bc561b38cef6878ec4e6af2b75f342011f2925df0b1abc34d7ac602e53da4a1d79550a8426efe73db1da
+  data.tar.gz: 26e28e273e9d7cf80773a990c94b7866059fead5a22b4b949a59a4839544b1be5860973a792b2ac40422b7c31d6db53e06223a4dd500efe840bd6a17b2c9afd9

data/README.md

@@ -98,6 +98,52 @@ raw_graph = {
 Dither.all_edges(raw_graph)
 ```
 
+Random walk on a graph.  Each edge has equal weight.
+```ruby
+raw_graph = {
+      :origin => 0,
+      :edges => [
+        {
+          :name => :a,
+          :src_vertex => 0,
+          :dst_vertex => 1,
+        },
+        {
+          :name => :b,
+          :src_vertex => 0,
+          :dst_vertex => 2,
+        },
+        {
+          :name => :c,
+          :src_vertex => 1,
+          :dst_vertex => 2,
+        },
+        {
+          :name => :d,
+          :src_vertex => 1,
+          :dst_vertex => 3,
+        },
+        {
+          :name => :e,
+          :src_vertex => 2,
+          :dst_vertex => 3,
+        },
+        {
+          :name => :f,
+          :src_vertex => 3,
+          :dst_vertex => 0,
+        }
+      ]
+    }
+
+graph = Dither::Graph.create(raw_graph)
+
+# infinite sequence of random walks
+graph.each do |path|
+  puts path.map(&:name).to_s
+end
+```
+
 
 # Note on Patches/Pull Requests
 

data/lib/dither.rb

@@ -43,6 +43,7 @@ require 'dither/mipog'
 require 'dither/chinese_postman_problem'
 require 'dither/aetg'
 require 'dither/aetg_pairwise'
+require 'dither/graph'
 
 if RUBY_PLATFORM =~ /java/
   require 'java'

data/lib/dither/graph.rb

@@ -0,0 +1,102 @@
+
+module Dither
+  class Graph
+    include Enumerable
+
+    attr_accessor :rand, :max_depth, :origin_name
+    attr_reader :vertices, :edges, :stop_conditions, :skip_conditions
+    Edge = Struct.new(:name, :src_vertex, :dst_vertex, :count)
+    Vertex = Struct.new(:name, :edges, :count)
+
+    def initialize
+      @vertices = {}
+      @edges = []
+      @stop_conditions = []
+      @skip_conditions = []
+      @rand = Random.new
+      @max_depth = 10
+			@origin_name = :origin
+    end
+
+    def self.create(hash)
+      edges = hash[:edges]
+      graph = Graph.new
+			graph.origin_name = hash[:origin] if hash.has_key?(:origin)
+
+      edges.each do |edge|
+        graph.add_edge(edge[:name], edge[:src_vertex], edge[:dst_vertex])
+      end
+      graph
+    end
+
+    def add_edge(name, src_vertex_name, dst_vertex_name)
+      # check & create vertexes if they do not exist
+      vertices[src_vertex_name] ||= Vertex.new(src_vertex_name, [], 0)
+      vertices[dst_vertex_name] ||= Vertex.new(dst_vertex_name, [], 0)
+
+      # add edge to src_vertex
+      src_vertex = vertices[src_vertex_name]
+      dst_vertex = vertices[dst_vertex_name]
+      edge = Edge.new(name, src_vertex, dst_vertex, 0)
+      src_vertex.edges << edge
+      edges << edge
+
+      self
+    end
+
+    def add_skip_condition(cond)
+      raise Dither::Error, "#{cond} does not respond to skip?" unless cond.respond_to? :skip?
+      skip_conditions << cond
+    end
+
+    def add_stop_condition(cond)
+      raise Dither::Error, "#{cond} does not respond to stop?" unless cond.respond_to? :stop?
+      stop_conditions << cond
+    end
+
+    def origin
+      vertices[origin_name]
+    end
+
+    def random_walk
+      current_edge = origin.edges.sample(:random => rand)
+      current_max_depth = max_depth - 1
+      loop do
+        current_edge.src_vertex.count += 1
+        current_edge.count += 1
+        yield current_edge
+        current_edge = current_edge.dst_vertex.edges.sample(:random => rand)
+        current_max_depth -= 1
+        break if current_max_depth < 0 || current_edge.src_vertex.name == origin_name
+      end
+    end
+
+    def each
+      loop do
+        break if stop?
+        path = []
+        random_walk { |a| path << a }
+        next if skip?
+        yield path
+      end
+    end
+
+    def stop?
+      stop_conditions.any? { |cond| cond.stop?(self) }
+    end
+
+    def skip?
+      skip_conditions.any? { |cond| cond.skip?(self) }
+    end
+
+    def vertices_covered
+      b = vertices.count { |a| a.count > 0 }
+      b/vertices.length.to_f
+    end
+
+    def edges_covered
+      b = edges.count { |a| a.count > 0 }
+      b/edges.length.to_f
+    end
+  end
+end

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/dither/graph_spec.rb

@@ -0,0 +1,124 @@
+
+require File.expand_path('../../spec_helper.rb', __FILE__)
+
+describe Dither::Graph do
+  let(:raw_graph) do
+    {
+      :edges => [
+        {
+          :name => :a,
+          :src_vertex => :origin,
+          :dst_vertex => 1,
+        },
+        {
+          :name => :b,
+          :src_vertex => :origin,
+          :dst_vertex => 2,
+        },
+        {
+          :name => :c,
+          :src_vertex => 1,
+          :dst_vertex => 2,
+        },
+        {
+          :name => :d,
+          :src_vertex => 1,
+          :dst_vertex => 3,
+        },
+        {
+          :name => :e,
+          :src_vertex => 2,
+          :dst_vertex => 3,
+        },
+        {
+          :name => :f,
+          :src_vertex => 3,
+          :dst_vertex => :origin,
+        }
+      ]
+    }
+  end
+
+
+  let(:raw_graph_infinite_cycle) do
+		{
+			:origin => 0,
+			:edges => [
+        {
+          :name => :a,
+          :src_vertex => 0,
+          :dst_vertex => 1,
+        },
+        {
+          :name => :b,
+          :src_vertex => 1,
+          :dst_vertex => 2,
+        },
+        {
+          :name => :c,
+          :src_vertex => 2,
+          :dst_vertex => 1,
+        },
+      ]
+    }
+  end
+
+  it 'can run random walk' do
+    graph = Dither::Graph.create(raw_graph)
+    graph.rand = Random.new 0
+    graph.each do |path|
+      first = path.map(&:name)
+      expect(first).to eql([:a, :d, :f])
+      break
+    end
+  end
+
+  it 'can skip at skip condition' do
+    graph = Dither::Graph.create(raw_graph_infinite_cycle)
+    stop_cond = 'stop_cond'
+    def stop_cond.stop?(graph)
+      @count ||= 0
+      @count += 1
+      @count > 2
+    end
+    skip_cond = double("skip_cond", :skip? => true)
+    graph.add_skip_condition(skip_cond)
+    graph.add_stop_condition(stop_cond)
+    count = 0
+    graph.each do |a|
+      count += 1
+    end
+
+    expect(count).to eql(0)
+  end
+
+  it 'can stop at stop condition' do
+    graph = Dither::Graph.create(raw_graph_infinite_cycle)
+    cond = double("stop_cond", :stop? => true)
+    graph.add_stop_condition(cond)
+    count = 0
+    graph.each { |a| count += 1 }
+
+    expect(count).to eql(0)
+  end
+
+  it 'infinite cycle terminates at max_depth' do
+    graph = Dither::Graph.create(raw_graph_infinite_cycle)
+    graph.random_walk { |a| }
+
+    edge_count = graph.edges.map(&:count).reduce(&:+)
+    expect(edge_count).to eql(graph.max_depth)
+  end
+
+  it 'raise error when invalid stop condition' do
+    graph = Dither::Graph.new
+
+    expect { graph.add_stop_condition("hi") }.to raise_error
+  end
+
+  it 'raise error when invalid skip condition' do
+    graph = Dither::Graph.new
+
+    expect { graph.add_skip_condition("hi") }.to raise_error
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: java
 authors:
 - Jason Gowan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,7 @@ files:
 - lib/dither/aetg.rb
 - lib/dither/aetg_pairwise.rb
 - lib/dither/chinese_postman_problem.rb
+- lib/dither/graph.rb
 - lib/dither/ipog.rb
 - lib/dither/ipog_helper.rb
 - lib/dither/java_ext/dither.rb
@@ -82,6 +83,7 @@ files:
 - lib/dither/version.rb
 - spec/dither/chinese_postman_problem_spec.rb
 - spec/dither/dither_spec.rb
+- spec/dither/graph_spec.rb
 - spec/spec_helper.rb
 - lib/dither-0.1.2.jar
 - lib/choco-solver-3.3.1-with-dependencies.jar
@@ -112,4 +114,5 @@ summary: Collection of test generation strategies
 test_files:
 - spec/dither/chinese_postman_problem_spec.rb
 - spec/dither/dither_spec.rb
+- spec/dither/graph_spec.rb
 - spec/spec_helper.rb