rbbt-util 5.5.60 → 5.5.61

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTllNjc1OWUxMDdmZmNhMzYyZmMyODU5YTczNzBmOWJkMDg1MTRlMQ==
+    NzEzYWRlNjc2MzkzNDIzZDI4MDE1ODQxZWZkM2QwZDA0ZWY1ZDdmYw==
   data.tar.gz: !binary |-
-    ZTFhYjMxOTg0ZmUwMzBiZDRkMGRlYzU1YzcxNjMyOGMxOTQ1MDdjYg==
+    ODM5MjlhNWFlYjhlZmFhZGY2OTFlMzg3Y2EwMjY2ODI3NzMxZmFhMg==
 SHA512:
   metadata.gz: !binary |-
-    OWVkOWNhMzlmM2MzOGM5ZjI1MzEyZDZkMzViYjNjMTI0MDVhZDFkZjgzZDEx
-    ZGZmOWI2MDc0ZjQyMWU4ZGU2MmViNTU0ZWVjOWEzZDdhOGQyNDk2NTk4Yjcz
-    ZjJlZTkxZWYwYjk5MjhhMGM5MDBlZDk0ZmZkZmY3NDI0ZDA5NGM=
+    MzQ4NTkyMTdhNWQ1YzAxNzc2N2RjYWVjYmJiMTZkYTA3YWYxODY3MjAyNzRm
+    YzM1MTNjMTdmZmU1MzZiYzk3ZTZjOTQ4NDMzNjFjMWJlMGQ0NzczYWUzYTZl
+    MmM3NTIxZGQyZTlkMGVmYjk4MWQ5ZTk2ZDUzYWI2ZjhhYWMxNDA=
   data.tar.gz: !binary |-
-    NGRkZmJlZDg0ZmRlNTcxZDdjM2FlYTE0MTFkODc5NGUxZGJjMDIwNzczNjc1
-    ZjM5YjUxZTEzMGZiNmYxNjY4NGEyMWFiMTY4YjMzYmIwNGU1MzIwZDhlMDc4
-    MjVmN2Y3NzRiYTU2YzA0M2Q3ODFjN2JhNGM3Mzk2MzVhYWZlNTg=
+    ZWExY2RlZjdhNjdhMGE3ZTVkZDdkYTJhNTQ0ZDRmYTM4NDc3YTJlMmZhZjIz
+    ZTIwNzBiMTM0Y2E5MjA5NDE3YzRhMzNhNmY5Mjc3MmRhNGQzNzYyOTk4NzQ3
+    MjdiYzg4NGYzM2FmYTlhNGJmNDNkYmM4OTM5Y2I3ZWNhY2I4MjU=

data/lib/rbbt/association.rb

@@ -79,6 +79,7 @@ module Association
       :key_field => all_fields.index(source), 
       :fields => fields.collect{|f| String === f ? all_fields.index(f): f },
       :type => options[:type].to_s == :flat ? :flat : :double,
+      :unnamed => true,
       :merge => options[:type].to_s == :flat ? false : true
     })
 

data/lib/rbbt/association/index.rb

@@ -35,6 +35,7 @@ module Association
                      new.unnamed = true
 
                      Association::Index.setup new
+
                      new
                    end
     end
@@ -69,10 +70,12 @@ module Association
     end
 
     def subset(source, target)
-      return [] if source.nil? or source.empty? or target.nil? or target.empty?
+      return [] if source.nil? or source.empty? or (target and target.empty?)
 
       matches = source.uniq.inject([]){|acc,e| acc.concat(match(e)) }
 
+      return matches if target.nil?
+
       target_matches = {}
 
       matches.each{|code| 
@@ -87,6 +90,7 @@ module Association
 
     def subset_entities(entities)
       source, target = select_entities(entities)
+      raise "No source entities found" if source.nil? 
       subset source, target
     end
   end

data/lib/rbbt/knowledge_base.rb

@@ -251,8 +251,8 @@ class KnowledgeBase
 
   #{{{ Query
   
-  def setup(name, matches)
-    AssociationItem.setup matches, self, name, false
+  def setup(name, matches, reverse = false)
+    AssociationItem.setup matches, self, name, reverse
   end
 
   def all(name, options={})
@@ -289,7 +289,11 @@ class KnowledgeBase
       raise "Entities are not a Hash or an AnnotatedArray: #{Misc.fingerprint entities}"
     end
     repo = get_index name
-    setup(name, repo.subset_entities(entities))
+    begin
+      setup(name, repo.subset_entities(entities))
+    rescue 
+      setup(name, repo.reverse.subset_entities(entities), true)
+    end
   end
 
   def translate(entities, type)

data/lib/rbbt/util/misc.rb

@@ -240,8 +240,6 @@ module Misc
   end
 
   def self.fingerprint(obj)
-    #DEBUG
-    return "nil" if obj.nil?
     case obj
     when nil
       "nil"

data/share/rbbt_commands/study/task

@@ -116,6 +116,7 @@ EOF
 end
 
 study = ARGV.shift.dup
+
 if Open.exists? study
   dir = study
   study = Study.setup(File.basename(study))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.60
+  version: 5.5.61
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake