rbbt-dm 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a64441aa1cd02aa113a218e75d8a45e8679404d
-  data.tar.gz: 3d8ec7e4202bdb5ec1f79baa95e534ad84270369
+  metadata.gz: 2d622e348e2b667b9a7a50d72b838b052a901ee1
+  data.tar.gz: 52aa969ad1244db73caa9869c7aac95ba676d8ea
 SHA512:
-  metadata.gz: 79dde04bbfa4955f595c6bc702c9c5791029ed0a52e5720cf8e453036cfa6279ac1aea49fd5eba399fc68e1a8fcdc2db7428beba21cf5fec68bb3f93653b5533
-  data.tar.gz: f43dc00fa73c817da58a807163feba66b3ce2275ff4b1c51f42ba458f3c8448047cc013da82c8be6aadd3cd57111dbe376a39166985497328867e34c0c0880ab
+  metadata.gz: ffc9db25cf186b73e846075f71704c48e2cd0287543d85c949a7ebaeef272351bdd064ed110dcdab6acbccf1e2819133e7a0a7ee74c3a65e7cfc2a42d9c3e070
+  data.tar.gz: a17ba0299410b15b3ca4baedae8b2b85821782f3217809a99f7353f09249a90b86bd4005b30413d8612700cb05d15f4d38f5521976d7de2704bc52c2c2a1fca8

data/lib/rbbt/network/paths.rb

@@ -61,9 +61,9 @@ module Paths
       distances[u] = distance
       path = extract_path(parents, start_node, u)
       next if path.length > max_steps if max_steps 
-      next if not adjacency.include?(u) or adjacency[u].nil? or adjacency[u].empty? 
+      next if not adjacency.include?(u) or (adjacency[u].nil? or adjacency[u].empty? )
       Misc.zip_fields(adjacency[u]).each do |v,node_dist|
-        next if threshold and node_dist > threshold
+        next if node_dist.nil? or (threshold and node_dist > threshold)
         d = distance + node_dist
         next unless d < distances[v] and d < best # we can't relax this one
         active[v] << d
@@ -102,6 +102,7 @@ module Paths
       distances[u] = distance
       next if not adjacency.include?(u) or adjacency[u].nil? or adjacency[u].empty?
       Misc.zip_fields(adjacency[u]).each do |v,node_dist|
+        next if node_dist.nil?
         d = distance + (node_dist * (l + rand))
         next unless d < distances[v] and d < best # we can't relax this one
         active[v] << distances[v] = d
@@ -152,3 +153,63 @@ module Entity
     end
   end
 end
+
+module AssociationItem
+
+  def self.dijkstra(matches, start_node, end_node = nil, threshold = nil, max_steps = nil, &block)
+    adjacency = {}
+
+    matches.each do |m|
+      s, t, undirected = m.split "~"
+      next m if s.nil? or t.nil? or s.strip.empty? or t.strip.empty?
+      adjacency[s] ||= Set.new
+      adjacency[s] << t 
+      next unless m.undirected
+      adjacency[t] ||= Set.new
+      adjacency[t] << s  
+    end
+
+    return nil unless adjacency.include? start_node
+
+    active = PriorityQueue.new         
+    distances = Hash.new { 1.0 / 0.0 } 
+    parents = Hash.new                 
+
+    active[start_node] << 0
+    best = 1.0 / 0.0
+    found = false
+    node_dist_cache = {}
+
+    until active.empty?
+      u = active.priorities.first
+      distance = active.shift
+      distances[u] = distance
+      path = Paths.extract_path(parents, start_node, u)
+      next if path.length > max_steps if max_steps 
+      next if not adjacency.include?(u) or (adjacency[u].nil? or adjacency[u].empty? )
+      adjacency[u].each do |v|
+        node_dist = node_dist_cache[[u,v]] ||= (block_given? ? block.call(u,v) : 1)
+        next if node_dist.nil? or (threshold and node_dist > threshold)
+        d = distance + node_dist
+        next unless d < distances[v] and d < best # we can't relax this one
+        active[v] << d
+        distances[v] = d
+        parents[v] = u
+        if (String === end_node ? end_node == v : end_node.include?(v))
+          best = d 
+          found = true
+        end
+      end    
+    end
+
+    return nil unless found
+
+    if end_node
+      end_node = (end_node & parents.keys).first unless String === end_node
+      return nil if not parents.include? end_node
+      Paths.extract_path(parents, start_node, end_node)
+    else
+      parents
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-dm
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util