shalmaneser-lib 1.2.rc5 → 1.2.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925773238e9b659fbfec8c118b4a22f4f2fb909b
-  data.tar.gz: da6bbfc8e3b8d33cc45ec17cd8c9c39044db86e2
+  metadata.gz: f300c7da721047a8cae71a1b9a9a4d42b9d25d5b
+  data.tar.gz: ed1cdf9daaa109828b6c6d04873748d79bacb026
 SHA512:
-  metadata.gz: abeebd6acb3c45fe07bb13e5e281b711b30c296b0d4546fad9b8d0ce11dbc4617241efffaf56066b3bc49ac8216bf6ccae6f8a3bc12ad788129f111d63e609d2
-  data.tar.gz: 1d1e18b0bd144fe5aaa3058fed3e6fe5e5d80648c43e6d3e175daaf97d1ce491dbf80e7aceec9be387a65d2d6dade1d6b5d7407302442446d46a7f9afb473c61
+  metadata.gz: 398654afcbd1a630e9465b652fe7714c8439f89603838e41b3770cbbff83eaf1887e4cd7fd54bec9c5426fe7289d549a9e33c34da8d924ce97bec6e4bdc02734
+  data.tar.gz: 8ff8af846f337aff5a32b474b5c112a462878ecfc65a20bad81483d176922d8cd826a136116a117a4ab31675bd85bf277d3ad2fec94b42011a3e056de3f860c5

data/lib/definitions.rb

@@ -2,18 +2,18 @@ module Shalmaneser
   LICENSE = 'GPL-2.0'
   module Frappe
     PROGRAM_NAME = 'Frappe'
-    VERSION = '1.2.rc5'
+    VERSION = '1.2.rc6'
   end
   module Fred
     PROGRAM_NAME = 'Fred'
-    VERSION = '1.2.rc5'
+    VERSION = '1.2.rc6'
   end
   module Rosy
     PROGRAM_NAME = 'Rosy'
-    VERSION = '1.2.rc5'
+    VERSION = '1.2.rc6'
   end
   module Shalmaneser
     PROGRAM_NAME = 'Shalmaneser'
-    VERSION = '1.2.rc5'
+    VERSION = '1.2.rc6'
   end
 end

data/lib/salsa_tiger_xml/graph_node.rb

@@ -1,347 +1,348 @@
 module STXML
-# GraphNode: describes one node in a graph.
-#
-# A node may have an arbitrary number of parents (sources of incoming edges)
-# and an arbitrary number of children (targets of outgoing edges)
-#
-# All edges are labeled and directed
-#
-# The add_parent, add_child, remove_parent, remove_child methods
-# take care of both ends of an edge
-# (i.e. n1.add_child(n2, label) also adds n1 as parent of n2 with edge label 'label'
-#
-# It is possible to create a 'pointer' rather than an edge:
-#     n1.add_child(n2, label, pointer_insteadof_edge => true)
-# will create an edge from n1 to n2 labeled 'label' that is
-# listed under the outgoing edges of n1, but not among
-# the incoming edges of n2
-# The same option is available for add_parent, remove_parent, remove_child.
-
-class GraphNode
-
-  def initialize(id)
-    @id = id
-    @children = []
-    @parents =  []
-    @features = {}
-  end
+  # GraphNode: describes one node in a graph.
+  #
+  # A node may have an arbitrary number of parents (sources of incoming edges)
+  # and an arbitrary number of children (targets of outgoing edges)
+  #
+  # All edges are labeled and directed
+  #
+  # The add_parent, add_child, remove_parent, remove_child methods
+  # take care of both ends of an edge
+  # (i.e. n1.add_child(n2, label) also adds n1 as parent of n2 with edge label 'label'
+  #
+  # It is possible to create a 'pointer' rather than an edge:
+  #     n1.add_child(n2, label, pointer_insteadof_edge => true)
+  # will create an edge from n1 to n2 labeled 'label' that is
+  # listed under the outgoing edges of n1, but not among
+  # the incoming edges of n2
+  # The same option is available for add_parent, remove_parent, remove_child.
+  # @note AB: This class is used only for subclassing.
+  # @abstract
+  class GraphNode
+
+    def initialize(id)
+      @id = id
+      @children = []
+      @parents =  []
+      @features = {}
+    end
 
-  # for Marshalling:
-  # Dump just IDs instead of actual nodes from Parents and Children lists.
-  # Otherwise the Marshaller will go crazy following
-  # all the links to objects mentioned.
-  # After loading: replace IDs by actual objects with a little help
-  # from the caller.
-  # @deprecated This method seams to be useless.
-  def _dump(depth)
-    @id.to_s +
-      "QQSEPVALUESQQ" +
-      Marshal.dump(@features) +
-      "QQSEPVALUESQQ" +
-      @children.map { |label_child|
+    # for Marshalling:
+    # Dump just IDs instead of actual nodes from Parents and Children lists.
+    # Otherwise the Marshaller will go crazy following
+    # all the links to objects mentioned.
+    # After loading: replace IDs by actual objects with a little help
+    # from the caller.
+    # @deprecated This method seams to be useless.
+    def _dump(depth)
+      @id.to_s +
+        "QQSEPVALUESQQ" +
+        Marshal.dump(@features) +
+        "QQSEPVALUESQQ" +
+        @children.map { |label_child|
         label_child[0] + "QQSEPQQ" + label_child[1].id
       }.join("QQPAIRQQ") +
-      "QQSEPVALUESQQ" +
-      @parents.map { |label_parent|
+        "QQSEPVALUESQQ" +
+        @parents.map { |label_parent|
         label_parent[0] + "QQSEPQQ" + label_parent[1].id
-    }.join("QQPAIRQQ")
-  end
+      }.join("QQPAIRQQ")
+    end
 
-  def self._load(string)
-    id, _features_s, _children_s, _parents_s = string.split("QQSEPVALUESQQ")
+    def self._load(string)
+      id, _features_s, _children_s, _parents_s = string.split("QQSEPVALUESQQ")
 
-    result = GraphNode.new(id)
-    result.fill_from_pickle(string)
+      result = GraphNode.new(id)
+      result.fill_from_pickle(string)
 
-    result
-  end
+      result
+    end
 
-  def fill_from_pickle(string)
-    _id, features_s, children_s, parents_s = string.split("QQSEPVALUESQQ")
+    def fill_from_pickle(string)
+      _id, features_s, children_s, parents_s = string.split("QQSEPVALUESQQ")
 
-    @features = Marshal.load(features_s)
+      @features = Marshal.load(features_s)
 
-    if children_s.nil? || children_s.empty?
-      @children = []
-    else
-      @children = children_s.split("QQPAIRQQ").map do |pair|
-        pair.split("QQSEPQQ")
+      if children_s.nil? || children_s.empty?
+        @children = []
+      else
+        @children = children_s.split("QQPAIRQQ").map do |pair|
+          pair.split("QQSEPQQ")
+        end
       end
-    end
 
-    if parents_s.nil? || parents_s.empty?
-      @parents = []
-    else
-      @parents = parents_s.split("QQPAIRQQ").map { |pair|
-        pair.split("QQSEPQQ")
-      }
+      if parents_s.nil? || parents_s.empty?
+        @parents = []
+      else
+        @parents = parents_s.split("QQPAIRQQ").map { |pair|
+          pair.split("QQSEPQQ")
+        }
+      end
     end
-  end
 
-  def recover_from_dump(node_by_id)
-    @children = @children.map { |label_id| [label_id[0], node_by_id.call(label_id[1])] }
-    @parents = @parents.map { |label_id| [label_id[0], node_by_id.call(label_id[1])] }
-  end
+    def recover_from_dump(node_by_id)
+      @children = @children.map { |label_id| [label_id[0], node_by_id.call(label_id[1])] }
+      @parents = @parents.map { |label_id| [label_id[0], node_by_id.call(label_id[1])] }
+    end
 
-  # ID-related things
-  def ==(other)
-    if other.is_a?(GraphNode)
-      @id == other.id
-    else
-      false
+    # ID-related things
+    def ==(other)
+      if other.is_a?(GraphNode)
+        @id == other.id
+      else
+        false
+      end
     end
-  end
 
-  def id
-    @id
-  end
+    def id
+      @id
+    end
 
-  def chid(newid)
-    @id = newid
-  end
+    def chid(newid)
+      @id = newid
+    end
 
-  # setting and retrieving features
+    # setting and retrieving features
 
-  def get_f(feature)
-    @features[feature]
-  end
+    def get_f(feature)
+      @features[feature]
+    end
 
-  def set_f(feature, value)
-    @features[feature] = value
-  end
+    def set_f(feature, value)
+      @features[feature] = value
+    end
 
-  def add_f(feature, value)
-    unless @features[feature].nil?
-      raise "Feature " + feature + "already set."
+    def add_f(feature, value)
+      unless @features[feature].nil?
+        raise "Feature " + feature + "already set."
+      end
+      set_f(feature, value)
     end
-    set_f(feature, value)
-  end
 
-  # ancestors
+    # ancestors
 
-  def parents
-    @parents.map { |label| label[1] }
-  end
+    def parents
+      @parents.map { |label| label[1] }
+    end
 
-  def parent_labels
-    @parents.map { |label_parent| label_parent[0] }
-  end
+    def parent_labels
+      @parents.map { |label_parent| label_parent[0] }
+    end
 
-  def parent_label(parent)
-    @parents.each do |label_parent|
-      if label_parent[1] == parent
-        return label_parent[0]
+    def parent_label(parent)
+      @parents.each do |label_parent|
+        if label_parent[1] == parent
+          return label_parent[0]
+        end
       end
-    end
 
-    nil
-  end
+      nil
+    end
 
-  def parents_with_edgelabel
-    @parents
-  end
+    def parents_with_edgelabel
+      @parents
+    end
 
-  def each_parent
-    @parents.each { |label_parent| yield label_parent[1] }
-  end
+    def each_parent
+      @parents.each { |label_parent| yield label_parent[1] }
+    end
 
-  def each_parent_with_edgelabel
-    @parents.each { |label_parent| yield label_parent}
-  end
+    def each_parent_with_edgelabel
+      @parents.each { |label_parent| yield label_parent}
+    end
 
-  def parents_by_edgelabels(labels)
-    @parents.select { |label_parent|
-      labels.include? label_parent[0]
-    }.map { |label_parent|
-      label_parent[1]
-    }
-  end
+    def parents_by_edgelabels(labels)
+      @parents.select { |label_parent|
+        labels.include? label_parent[0]
+      }.map { |label_parent|
+        label_parent[1]
+      }
+    end
 
-  def add_parent(parent, edgelabel, varhash = {})
-    @parents << [edgelabel, parent]
+    def add_parent(parent, edgelabel, varhash = {})
+      @parents << [edgelabel, parent]
 
-    # and vice versa: add self as child to parent
-    unless varhash["pointer_insteadof_edge"]
-      unless parent.children_with_edgelabel.include? [edgelabel, self]
-        parent.add_child(self, edgelabel)
+      # and vice versa: add self as child to parent
+      unless varhash["pointer_insteadof_edge"]
+        unless parent.children_with_edgelabel.include? [edgelabel, self]
+          parent.add_child(self, edgelabel)
+        end
       end
     end
-  end
 
-  def remove_parent(parent, edgelabel, varhash={})
-    @parents = @parents.reject { |label_child|
-      label_child.first == edgelabel and
-        label_child.last == parent
-    }
+    def remove_parent(parent, edgelabel, varhash={})
+      @parents = @parents.reject { |label_child|
+        label_child.first == edgelabel and
+          label_child.last == parent
+      }
 
-    # and vice versa: remove self as child from parent
-    unless varhash["pointer_insteadof_edge"]
-      if parent.children_with_edgelabel.include? [edgelabel, self]
-        parent.remove_child(self, edgelabel)
+      # and vice versa: remove self as child from parent
+      unless varhash["pointer_insteadof_edge"]
+        if parent.children_with_edgelabel.include? [edgelabel, self]
+          parent.remove_child(self, edgelabel)
+        end
       end
     end
-  end
 
-  def indeg
-    @parents.length
-  end
+    def indeg
+      @parents.length
+    end
 
-  def ancestors
-    ancestors_noduplicates([], [])
-  end
+    def ancestors
+      ancestors_noduplicates([], [])
+    end
 
-  def ancestors_by_edgelabels(labels)
-    ancestors_noduplicates([], labels)
-  end
+    def ancestors_by_edgelabels(labels)
+      ancestors_noduplicates([], labels)
+    end
 
-  # descendants
+    # descendants
 
-  def children
-    @children.map { |label_child| label_child[1] }
-  end
+    def children
+      @children.map { |label_child| label_child[1] }
+    end
 
-  def child_labels
-    @children.map { |label_child| label_child[0] }
-  end
+    def child_labels
+      @children.map { |label_child| label_child[0] }
+    end
 
-  def child_label(child)
-    @children.each { |label_child|
-      if label_child[1] == child
-        return label_child[0]
-      end
-    }
+    def child_label(child)
+      @children.each { |label_child|
+        if label_child[1] == child
+          return label_child[0]
+        end
+      }
 
-    nil
-  end
+      nil
+    end
 
-  def children_with_edgelabel
-    @children
-  end
+    def children_with_edgelabel
+      @children
+    end
 
-  def each_child
-    @children.each { |label_child| yield label_child[1]}
-  end
+    def each_child
+      @children.each { |label_child| yield label_child[1]}
+    end
 
-  def each_child_with_edgelabel
-    @children.each { |label_child| yield label_child }
-  end
+    def each_child_with_edgelabel
+      @children.each { |label_child| yield label_child }
+    end
 
-  def children_by_edgelabels(labels)
-    return @children.select { |label_child|
-      labels.include? label_child[0]
-    }.map { |label_child|
-      label_child[1]
-    }
-  end
+    def children_by_edgelabels(labels)
+      return @children.select { |label_child|
+        labels.include? label_child[0]
+      }.map { |label_child|
+        label_child[1]
+      }
+    end
 
-  def add_child(child, edgelabel, varhash = {})
-    @children << [edgelabel, child]
+    def add_child(child, edgelabel, varhash = {})
+      @children << [edgelabel, child]
 
-    # and vice versa: add self as parent to child
-    unless varhash["pointer_insteadof_edge"]
-      unless child.parents_with_edgelabel.include? [edgelabel, self]
-        child.add_parent(self, edgelabel)
+      # and vice versa: add self as parent to child
+      unless varhash["pointer_insteadof_edge"]
+        unless child.parents_with_edgelabel.include? [edgelabel, self]
+          child.add_parent(self, edgelabel)
+        end
       end
     end
-  end
 
-  def remove_child(child, edgelabel, varhash={})
-    @children = @children.reject { |label_child|
-      label_child.first == edgelabel and
-        label_child.last == child
-    }
+    def remove_child(child, edgelabel, varhash={})
+      @children = @children.reject { |label_child|
+        label_child.first == edgelabel and
+          label_child.last == child
+      }
 
-    # and vice versa: remove self as parent from child
-    unless varhash["pointer_insteadof_edge"]
-      if child.parents_with_edgelabel.include? [edgelabel, self]
-        child.remove_parent(self, edgelabel)
+      # and vice versa: remove self as parent from child
+      unless varhash["pointer_insteadof_edge"]
+        if child.parents_with_edgelabel.include? [edgelabel, self]
+          child.remove_parent(self, edgelabel)
+        end
       end
     end
-  end
 
-  def change_child_label(child, oldlabel, newlabel, varhash={})
-    if @children.include? [oldlabel, child]
-      remove_child(child,oldlabel, varhash)
-      add_child(child, newlabel, varhash)
+    def change_child_label(child, oldlabel, newlabel, varhash={})
+      if @children.include? [oldlabel, child]
+        remove_child(child,oldlabel, varhash)
+        add_child(child, newlabel, varhash)
+      end
     end
-  end
 
-  def remove_all_children(varhash={})
-    each_child_with_edgelabel { |label, child|
-      remove_child(child, label, varhash)
-    }
-  end
-
-  def set_children(list, varhash={})
-    #### CAUTION: set_children must be called with an "internal format" list of parents:
-    ####          instead of using [node, edgelabel], use [edgelabel, node]
-    remove_all_children(varhash)
+    def remove_all_children(varhash={})
+      each_child_with_edgelabel { |label, child|
+        remove_child(child, label, varhash)
+      }
+    end
 
-    @children = list
-  end
+    def set_children(list, varhash={})
+      #### CAUTION: set_children must be called with an "internal format" list of parents:
+      ####          instead of using [node, edgelabel], use [edgelabel, node]
+      remove_all_children(varhash)
 
-  def outdeg
-    return @children.length
-  end
+      @children = list
+    end
 
-  def yield_nodes
-    arr = []
-    if outdeg == 0
-      arr << self
+    def outdeg
+      return @children.length
     end
-    each_child { |c|
-      if c.outdeg == 0
-        arr << c
-      else
-        arr.concat c.yield_nodes
+
+    def yield_nodes
+      arr = []
+      if outdeg == 0
+        arr << self
       end
-    }
-    return arr
-  end
+      each_child { |c|
+        if c.outdeg == 0
+          arr << c
+        else
+          arr.concat c.yield_nodes
+        end
+      }
+      return arr
+    end
 
-  def descendants
-    descendants_noduplicates([], [])
-  end
+    def descendants
+      descendants_noduplicates([], [])
+    end
 
-  def descendants_by_edgelabels(labels)
-    return descendants_noduplicates([], labels)
-  end
+    def descendants_by_edgelabels(labels)
+      return descendants_noduplicates([], labels)
+    end
 
-  protected
+    protected
 
-  def descendants_noduplicates(nodes, labels)
-    each_child_with_edgelabel { |l_c|
-      if labels.empty? or labels.include? l_c[0]
-        unless nodes.include? l_c[1]
-          nodes = l_c[1].descendants_noduplicates(nodes << l_c[1], labels)
+    def descendants_noduplicates(nodes, labels)
+      each_child_with_edgelabel { |l_c|
+        if labels.empty? or labels.include? l_c[0]
+          unless nodes.include? l_c[1]
+            nodes = l_c[1].descendants_noduplicates(nodes << l_c[1], labels)
+          end
         end
-      end
-    }
-    return nodes
-  end
+      }
+      return nodes
+    end
 
-  def ancestors_noduplicates(nodes, labels)
-    each_parent_with_edgelabel { |l_p|
-      if labels.empty? or labels.include? l_p[0]
-        unless nodes.include? l_p[1]
-          nodes = l_p[1].ancestors_noduplicates(nodes << l_p[1], labels)
+    def ancestors_noduplicates(nodes, labels)
+      each_parent_with_edgelabel { |l_p|
+        if labels.empty? or labels.include? l_p[0]
+          unless nodes.include? l_p[1]
+            nodes = l_p[1].ancestors_noduplicates(nodes << l_p[1], labels)
+          end
         end
-      end
-    }
-    return nodes
-  end
+      }
+      return nodes
+    end
 
-  #### CAUTION: set_parents must be called with an "internal format" list of parents:
-  ####          instead of using [node, edgelabel], use [edgelabel, node]
+    #### CAUTION: set_parents must be called with an "internal format" list of parents:
+    ####          instead of using [node, edgelabel], use [edgelabel, node]
 
-  def set_parents(list, varhash={})
-    each_parent_with_edgelabel { |label, parent|
-      remove_parent(parent, label, varhash)
-    }
+    def set_parents(list, varhash={})
+      each_parent_with_edgelabel { |label, parent|
+        remove_parent(parent, label, varhash)
+      }
 
-    list.each { |label, parent|
-      add_parent(label, parent)
-    }
+      list.each { |label, parent|
+        add_parent(label, parent)
+      }
+    end
   end
 end
-end

data/lib/salsa_tiger_xml/reg_xml.rb

@@ -5,11 +5,10 @@ module STXML
 
   # SalsaTigerRegXML: take control of the data structure, no underlying xml
   # representation anymore, re-generation of xml on demand
-
   class RegXML
-
-    def initialize(string, # string representing a single XML element
-                   i_am_text = false) # boolean: xml element (false) or text (true)
+    # string representing a single XML element
+    # boolean: xml element (false) or text (true)
+    def initialize(string, i_am_text = false)
 
       unless string.class == String
         raise "First argument to RegXML.new must be string. I got #{string.class}"

data/lib/salsa_tiger_xml/salsa_tiger_sentence.rb

@@ -96,12 +96,10 @@ module STXML
   #   text:  optional parameter, a string, arbitrary text commenting
   #          on the flag, used mainly with INTERESTING
   class SalsaTigerSentence < XMLNode
-    def self.empty_sentence(sentence_id)  # string
+    # @param [String] sentence_id Identificator for a new sentence.
+    def self.empty_sentence(sentence_id)
       sentence_id = sentence_id.gsub(/'/, "&apos;")
-      sent_string = "<s id=\'#{sentence_id}\'>\n" +
-                    "<graph/>\n" +
-                    "<sem/>\n" +
-                    "</s>"
+      sent_string = "<s id=\'#{sentence_id}\'>\n" + "<graph/>\n" + "<sem/>\n" + "</s>"
 
       SalsaTigerSentence.new(sent_string)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shalmaneser-lib
 version: !ruby/object:Gem::Version
-  version: 1.2.rc5
+  version: 1.2.rc6
 platform: ruby
 authors:
 - Andrei Beliankou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -113,7 +113,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement