treat 1.0.6 → 1.1.0

data/lib/treat/{formatters → workers/formatters}/unserializers/yaml.rb

@@ -1,6 +1,6 @@
 # This class is a wrapper for the Psych YAML
 # parser; it unserializes YAML files.
-class Treat::Formatters::Unserializers::YAML
+class Treat::Workers::Formatters::Unserializers::YAML
 
   silence_warnings do
     # Require the Psych YAML parser.

data/lib/treat/{formatters → workers/formatters}/visualizers/dot.rb

@@ -1,4 +1,4 @@
-class Treat::Formatters::Visualizers::DOT
+class Treat::Workers::Formatters::Visualizers::DOT
 
   require 'date'
   DefaultOptions = {

data/lib/treat/{formatters → workers/formatters}/visualizers/standoff.rb

@@ -1,7 +1,7 @@
 # This class allows the visualization of
 # an entity in standoff format; for example:
 # (S (NP John) (VP has (VP come))).
-class Treat::Formatters::Visualizers::Standoff
+class Treat::Workers::Formatters::Visualizers::Standoff
 
   # Start out with an indent of 0.
   DefaultOptions = { :indent => 0 }
@@ -44,8 +44,7 @@ class Treat::Formatters::Visualizers::Standoff
   end
   
   def self.ptb_escape(val)
-    Treat::Universalisation::Tags::
-    PTBEscapeCharacters.each do |char, esc|
+    Treat.tags.ptb.escape_characters.each do |char, esc|
       val.gsub!(char, val)
     end
     

data/lib/treat/{formatters → workers/formatters}/visualizers/tree.rb

@@ -1,6 +1,6 @@
 # This class generates an ASCII representation
 # of a tree of entities.
-class Treat::Formatters::Visualizers::Tree
+class Treat::Workers::Formatters::Visualizers::Tree
 
   # Start out with an indent at 0.
   DefaultOptions = { :indent => 0 }

data/lib/treat/{groupable.rb → workers/group.rb}

@@ -1,18 +1,18 @@
-module Treat::Groupable
+module Treat::Workers::Group
 
   # Lazily load the worker classes in the group.
   def const_missing(const)
     bits = self.ancestors[0].to_s.split('::')
     bits.collect! { |bit| ucc(bit) }
     file = bits.join('/') + "/#{ucc(const)}"
-    if not File.readable?(Treat.lib + "#{file}.rb")
+    if not File.readable?(Treat.paths.lib + "#{file}.rb")
       raise Treat::Exception,
       "File '#{file}.rb' corresponding to " +
       "requested worker #{self}::#{const} " +
       "does not exist."
     else
       require file
-      if not const_defined?(const)
+      if not self.const_defined?(const)
         raise Treat::Exception,
         "File #{file} does not define " +
         "#{self}::#{const}."
@@ -29,7 +29,7 @@ module Treat::Groupable
     mod = ucc(cl(self))
     if @@list[mod].nil?
       @@list[mod] = []
-      dirs = Dir[Treat.lib + "treat/*/#{mod}/*.rb"]
+      dirs = Dir[Treat.paths.lib + "treat/workers/*/#{mod}/*.rb"]
       dirs.each do |file|
         @@list[mod] <<
         file.split('/')[-1][0..-4].intern
@@ -100,6 +100,7 @@ module Treat::Groupable
       end
       
       self.recursive = false
+      self.list
       
       # Return the method corresponding to the group.
       # This method resolves the name of the method
@@ -116,11 +117,7 @@ module Treat::Groupable
         m = ucc(cl(self)).dup
         if  m[-4..-1] == 'zers'
           if type == :annotator
-            if m[-6] == 'l'
-              m[-5..-1] = ''
-            else
-              m[-5..-1] = 'y'
-            end
+            m[-5..-1] = m[-6] == 'l' ? '' : 'y'
           else
             m = m[0..-3]
           end
@@ -147,9 +144,6 @@ module Treat::Groupable
         @method = n.intern
       end
       
-      # Populate the group's list.
-      group.list
-      
     end
     
   end

data/lib/treat/{inflectors → workers/inflectors}/cardinalizers/linguistics.rb

@@ -3,10 +3,14 @@
 # number in words in cardinal form.
 #
 # Project website: http://deveiate.org/projects/Linguistics/
-module Treat::Inflectors::Cardinalizers::Linguistics
+module Treat::Workers::Inflectors::Cardinalizers::Linguistics
   
   require 'treat/loaders/linguistics'
   
+  DefaultOptions = {
+    :language => Treat.core.language.default
+  }
+  
   # Return the description of a cardinal number in words.
   #
   # Options:
@@ -32,8 +36,9 @@ module Treat::Inflectors::Cardinalizers::Linguistics
   #
   # More specific options when using :type => :ordinal:
   def self.cardinal(entity, options = {})
+    options = DefaultOptions.merge(options)
     Treat::Loaders::Linguistics.
-    load(entity.language).
+    load(options[:language]).
     numwords(entity.to_s, options)
   end
   

data/lib/treat/{inflectors → workers/inflectors}/conjugators/linguistics.rb

@@ -2,7 +2,7 @@
 # in the 'linguistics' gem that allow to conjugate verbs.
 #
 # Project website: http://deveiate.org/projects/Linguistics/
-module Treat::Inflectors::Conjugators::Linguistics
+module Treat::Workers::Inflectors::Conjugators::Linguistics
 
   require 'treat/loaders/linguistics'
   
@@ -12,10 +12,10 @@ module Treat::Inflectors::Conjugators::Linguistics
   
   Forms = {
     :present_participle =>
-    {:mode => :participle, :tense => :present},
-    :infinitive => {:mode => :infinitive},
-    :plural_verb => {:count => :plural},
-    :singular_verb => {:count => :singular}
+    {:mode => 'participle', :tense => 'present'},
+    :infinitive => {:mode => 'infinitive'},
+    :plural_verb => {:count => 'plural'},
+    :singular_verb => {:count => 'singular'}
   }
   
   # Conjugate a verb using ruby linguistics with the specified
@@ -33,16 +33,16 @@ module Treat::Inflectors::Conjugators::Linguistics
     
     options = DefaultOptions.merge(options)
     cat = entity.check_has(:category)
-    return if cat != :verb && options[:strict]
-    
+    return if cat != 'verb' && options[:strict]
+
     options = Forms[options[:form]] if options[:form]
-    
+
     klass = Treat::Loaders::Linguistics.load(entity.language)
-    if options[:mode] == :infinitive
+    if options[:mode] == 'infinitive'
       silence_warnings { klass.infinitive(entity.to_s) }
-    elsif options[:mode] == :participle && options[:tense] == :present
+    elsif options[:mode] == 'participle' && options[:tense] == 'present'
       silence_warnings { klass.present_participle(entity.to_s) }
-    elsif options[:count] == :plural && options.size == 1
+    elsif options[:count] == 'plural' && options.size == 1
       silence_warnings { klass.plural_verb(entity.to_s) }
     else
       raise Treat::Exception,

data/lib/treat/{inflectors → workers/inflectors}/declensors/active_support.rb

@@ -1,6 +1,6 @@
 # This class is a wrapper for the ActiveSupport
 # declension tools.
-class Treat::Inflectors::Declensors::English
+class Treat::Workers::Inflectors::Declensors::English
 
   require 'active_support/inflector/inflections'
 
@@ -8,7 +8,7 @@ class Treat::Inflectors::Declensors::English
   def self.declense(entity, options)
     
     cat = entity.check_has(:category)
-    unless [:noun, :adjective, :determiner].
+    unless ['noun', 'adjective', 'determiner'].
       include?(cat)
         return
     end

data/lib/treat/{inflectors → workers/inflectors}/declensors/english/inflect.rb

@@ -5,7 +5,7 @@
 # Released under the MIT License.
 #
 #  http://english.rubyforge.org
-module Treat::Inflectors::Declensors::English::Inflect
+module Treat::Workers::Inflectors::Declensors::English::Inflect
 
   @singular_of = {}
   @plural_of = {}

data/lib/treat/{inflectors → workers/inflectors}/declensors/english.rb

@@ -5,7 +5,7 @@
 # Released under the MIT License.
 #
 #  http://english.rubyforge.org
-class Treat::Inflectors::Declensors::English
+class Treat::Workers::Inflectors::Declensors::English
 
   require 'treat/inflectors/declensors/english/inflect'
   
@@ -15,7 +15,7 @@ class Treat::Inflectors::Declensors::English
   def self.declense(entity, options)
     
     cat = entity.check_has(:category)
-    unless [:noun, :adjective, :determiner].
+    unless ['noun', 'adjective', 'determiner'].
       include?(cat)
         return
     end

data/lib/treat/{inflectors → workers/inflectors}/declensors/linguistics.rb

@@ -3,7 +3,7 @@
 # declensions of a word.
 #
 # Project website: http://deveiate.org/projects/Linguistics/
-class Treat::Inflectors::Declensors::Linguistics
+class Treat::Workers::Inflectors::Declensors::Linguistics
 
   require 'treat/loaders/linguistics'
 
@@ -15,7 +15,7 @@ class Treat::Inflectors::Declensors::Linguistics
   def self.declense(entity, options = {})
     
     cat = entity.check_has(:category)
-    unless [:noun, :adjective, :determiner].
+    unless ['noun', 'adjective', 'determiner'].
       include?(cat)
         return
     end
@@ -28,10 +28,10 @@ class Treat::Inflectors::Declensors::Linguistics
     klass = Treat::Loaders::Linguistics.load(entity.language)
     string = entity.to_s
     
-    if options[:count] == :plural
+    if options[:count] == 'plural'
       
       if entity.has?(:category) &&
-        [:noun, :adjective, :verb].
+        ['noun', 'adjective', 'verb'].
         include?(entity.category)
         silence_warnings do
           klass.send(

data/lib/treat/{inflectors → workers/inflectors}/ordinalizers/linguistics.rb

@@ -3,14 +3,20 @@
 # number in words in ordinal form.
 #
 # Project website: http://deveiate.org/projects/Linguistics/
-class Treat::Inflectors::Ordinalizers::Linguistics
+class Treat::Workers::Inflectors::Ordinalizers::Linguistics
 
   require 'treat/loaders/linguistics'
   
+  DefaultOptions = {
+    :language => Treat.core.language.default
+  }
+  
   # Desribe a number in words in ordinal form, using the
   # 'linguistics' gem.
   def self.ordinal(number, options = {})
-    klass = Treat::Loaders::Linguistics.load(number.language)
+    options = DefaultOptions.merge(options)
+    klass = Treat::Loaders::
+    Linguistics.load(options[:language])
     klass.ordinate(number.to_s)
   end
   

data/lib/treat/{inflectors → workers/inflectors}/stemmers/porter.rb

@@ -2,7 +2,7 @@
 # Porter stemming algorithm, ported to Ruby from a
 # version coded up in Perl. This is a simplified
 # implementation; for a true and fast Porter stemmer,
-# see Treat::Inflectors::Stemmers::PorterC.
+# see Treat::Workers::Inflectors::Stemmers::PorterC.
 #
 # Authored by Ray Pereda (raypereda@hotmail.com).
 # Unknown license.
@@ -10,7 +10,7 @@
 # Original paper: Porter, 1980. An algorithm for suffix stripping,
 # Program, Vol. 14, no. 3, pp 130-137,
 # Original C implementation: http://www.tartarus.org/~martin/PorterStemmer.
-class Treat::Inflectors::Stemmers::Porter
+class Treat::Workers::Inflectors::Stemmers::Porter
   
   # Returns the stem of a word using a native Porter stemmer.
   #

data/lib/treat/{inflectors → workers/inflectors}/stemmers/porter_c.rb

@@ -5,7 +5,7 @@
 # Original paper: Porter, 1980. An algorithm for suffix stripping,
 # Program, Vol. 14, no. 3, pp 130-137,
 # Original C implementation: http://www.tartarus.org/~martin/PorterStemmer.
-module Treat::Inflectors::Stemmers::PorterC
+module Treat::Workers::Inflectors::Stemmers::PorterC
   
   # Require the 'ruby-stemmer' gem.
   silence_warnings { require 'lingua/stemmer' }

data/lib/treat/{inflectors → workers/inflectors}/stemmers/uea.rb

@@ -10,7 +10,7 @@
 # Original paper: Jenkins, Marie-Claire, Smith, Dan,
 # Conservative stemming for search and indexing, 2005.
 # http://www.uea.ac.uk/polopoly_fs/1.85493!stemmer25feb.pdf
-class Treat::Inflectors::Stemmers::UEA
+class Treat::Workers::Inflectors::Stemmers::UEA
 
   # Require the 'uea-stemmer' gem.
   silence_warnings { require 'uea-stemmer' }

data/lib/treat/{ai → workers/learners}/classifiers/id3.rb

@@ -1,4 +1,4 @@
-class Treat::AI::Classifiers::ID3
+class Treat::Workers::Learners::Classifiers::ID3
   
   require 'decisiontree'
   

data/lib/treat/{ai → workers/learners}/classifiers/mlp.rb

@@ -1,5 +1,5 @@
 # Currently, this MLP is limited to 1 output.
-class Treat::AI::Classifiers::MLP
+class Treat::Workers::Learners::Classifiers::MLP
   
   require 'ai4r'
   

data/lib/treat/{lexicalizers → workers/lexicalizers}/categorizers/from_tag.rb

@@ -1,20 +1,20 @@
 # Finds the general part of speech of an entity
 # (:sentence, :noun_phrase, :verb, :adverb, etc.)
 # from its tag (e.g. 'S', 'NP', 'VBZ', 'ADV', etc.).
-class Treat::Lexicalizers::Categorizers::FromTag
+class Treat::Workers::Lexicalizers::Categorizers::FromTag
 
-  Pttc = Treat::Universalisation::Tags::PhraseTagToCategory
-  Wttc = Treat::Universalisation::Tags::WordTagToCategory
-  Ptc = Treat::Universalisation::Tags::PunctuationToCategory
+  Pttc = Treat.tags.aligned.phrase_tags_to_category
+  Wttc = Treat.tags.aligned.word_tags_to_category
+  Ptc = Treat.linguistics.punctuation.punct_to_category
   
   # Find the category of the entity from its tag.
   def self.category(entity, options = {})
 
     tag = entity.check_has(:tag)
     
-    return :unknown if tag.nil? || tag == '' || entity.type == :symbol
-    return :sentence if tag == 'S' || entity.type == :sentence
-    return :number if entity.type == :number
+    return 'unknown' if tag.nil? || tag == '' || entity.type == :symbol
+    return 'sentence' if tag == 'S' || entity.type == :sentence
+    return 'number' if entity.type == :number
     
     return Ptc[entity.to_s] if entity.type == :punctuation
     
@@ -32,7 +32,7 @@ class Treat::Lexicalizers::Categorizers::FromTag
     if entity.has?(:tag_set)
       ts = entity.get(:tag_set)
     else
-      a = entity.ancestor_with_feature(:phrase, :tag_set)
+      a = entity.ancestor_with_feature(:tag_set)
       if a
         ts = a.get(:tag_set)
       else
@@ -51,7 +51,7 @@ class Treat::Lexicalizers::Categorizers::FromTag
       "for token #{entity.to_s}."
     end
 
-    :unknown
+    'unknown'
 
   end
 

data/lib/treat/{lexicalizers → workers/lexicalizers}/sensers/wordnet/synset.rb

@@ -1,5 +1,5 @@
 # An adaptor for synsets used by the Wordnet gem.
-class Treat::Lexicalizers::Sensers::Wordnet::Synset
+class Treat::Workers::Lexicalizers::Sensers::Wordnet::Synset
 
   # The POS tag of the word.
   attr_accessor :pos
@@ -61,7 +61,7 @@ class Treat::Lexicalizers::Sensers::Wordnet::Synset
   # Respond to the missing method event.
   def method_missing(sym, *args, &block)
     ret = @original_synset.send(sym)
-    if ret.is_a?(Treat::Lexicalizers::Sensers::Wordnet::Synset)
+    if ret.is_a?(Treat::Workers::Lexicalizers::Sensers::Wordnet::Synset)
       self.new(ret)
     else
       ret

data/lib/treat/{lexicalizers → workers/lexicalizers}/sensers/wordnet.rb

@@ -1,6 +1,6 @@
 # Obtain lexical information about a word using the
 # ruby 'wordnet' gem.
-class Treat::Lexicalizers::Sensers::Wordnet
+class Treat::Workers::Lexicalizers::Sensers::Wordnet
 
   # Require the 'wordnet' gem.
   require 'wordnet'
@@ -13,7 +13,7 @@ class Treat::Lexicalizers::Sensers::Wordnet
   end
   
   # Require an adaptor for Wordnet synsets.
-  require 'treat/lexicalizers/sensers/wordnet/synset'
+  require 'treat/workers/lexicalizers/sensers/wordnet/synset'
   
   # Noun, adjective and verb indexes.
   @@indexes = {}
@@ -29,7 +29,7 @@ class Treat::Lexicalizers::Sensers::Wordnet
       "the :nym option (:synonym, :hypernym, etc.)"
     end
     
-    unless [:noun, :adjective, :verb].
+    unless ['noun', 'adjective', 'verb'].
       include?(word.category)
       return []
     end
@@ -45,7 +45,7 @@ class Treat::Lexicalizers::Sensers::Wordnet
     
     lemma.synsets.each do |synset|
       synsets << 
-      Treat::Lexicalizers::Sensers::Wordnet::Synset.new(synset)
+      Treat::Workers::Lexicalizers::Sensers::Wordnet::Synset.new(synset)
     end
     
     ((synsets.collect do |ss|

data/lib/treat/{lexicalizers → workers/lexicalizers}/taggers/brill/patch.rb

@@ -7,7 +7,7 @@ begin
   # will clash with the top-level class 'Word'
   # we define when syntactic sugar is enabled.
 rescue TypeError
-  if Treat.sweetened?
+  if Treat.core.syntax.sweetened
     patch = true
     # Unset the class Word for the duration
     # of loading the tagger.
@@ -19,7 +19,7 @@ rescue TypeError
   end
 ensure
   # Reset the class Word if using syntactic sugar.
-  if Treat.sweetened? && patch
+  if Treat.core.syntax.sweetened && patch
     Object.const_set(:Word, Treat::Entities::Word)
   end
 end

data/lib/treat/{lexicalizers → workers/lexicalizers}/taggers/brill.rb

@@ -13,11 +13,11 @@
 # Project website:
 #
 # http://rbtagger.rubyforge.org/
-module Treat::Lexicalizers::Taggers::Brill
+module Treat::Workers::Lexicalizers::Taggers::Brill
 
   require 'rbtagger'
 
-  require 'treat/lexicalizers/taggers/brill/patch'
+  require 'treat/workers/lexicalizers/taggers/brill/patch'
 
   # Hold one instance of the tagger.
   @@tagger = nil
@@ -32,12 +32,6 @@ module Treat::Lexicalizers::Taggers::Brill
   # :contextual_rules => String (Contextual rules file to use)
   def self.tag(entity, options = {})
 
-    # Tokenize the sentence/phrase.
-    if !entity.has_children? &&
-      !entity.is_a?(Treat::Entities::Token)
-      entity.tokenize(options)
-    end
-    
     # Create the tagger if necessary
     @@tagger ||= ::Brill::Tagger.new(options[:lexicon],
     options[:lexical_rules], options[:contextual_rules])

data/lib/treat/{lexicalizers → workers/lexicalizers}/taggers/lingua.rb

@@ -12,7 +12,7 @@
 # Project website: http://engtagger.rubyforge.org/
 # Original Perl module site:
 # http://cpansearch.perl.org/src/ACOBURN/Lingua-EN-Tagger-0.15/
-class Treat::Lexicalizers::Taggers::Lingua
+class Treat::Workers::Lexicalizers::Taggers::Lingua
   
   # Require the 'engtagger' gem.
   silence_warnings { require 'engtagger' }
@@ -48,11 +48,6 @@ class Treat::Lexicalizers::Taggers::Lingua
   #   particularly words used polysemously.
   def self.tag(entity, options = {})
     
-    if !entity.has_children? && 
-      !entity.is_a?(Treat::Entities::Token)
-      entity.tokenize
-    end
-    
     options = DefaultOptions.merge(options)
     
     @@tagger ||= ::EngTagger.new(options)

data/lib/treat/{lexicalizers → workers/lexicalizers}/taggers/stanford.rb

@@ -1,11 +1,11 @@
 # Wrapper for the Stanford POS tagger.
-class Treat::Lexicalizers::Taggers::Stanford
+class Treat::Workers::Lexicalizers::Taggers::Stanford
 
   require 'treat/loaders/stanford'
 
   # Hold one tagger per language.
   @@taggers = {}
-  
+
   # Hold the default options.
   DefaultOptions =  {
     :tagger_model => nil
@@ -13,75 +13,64 @@ class Treat::Lexicalizers::Taggers::Stanford
 
   # Tag the word using one of the Stanford taggers.
   def self.tag(entity, options = {})
-    
-    # Tokenize the sentence/phrase.
-    if !entity.has_children? &&
-      !entity.is_a?(Treat::Entities::Token)
-      entity.tokenize(:stanford, options)
+
+    # Handle tags for sentences and phrases.
+    if entity.is_a?(Treat::Entities::Sentence) ||
+      (entity.is_a?(Treat::Entities::Phrase) &&
+      !entity.parent_sentence)
+
+      tag_set = options[:tag_set]
+      entity.set :tag_set, tag_set
+    end
+
+    if entity.is_a?(Treat::Entities::Sentence)
+      return 'S'
+    elsif entity.is_a?(Treat::Entities::Phrase)
+      return 'P'
     end
     
     # Handle options and initialize the tagger.
     lang = entity.language
     options = get_options(options, lang)
-    init_tagger(lang)
+    init_tagger(lang) unless @@taggers[lang]
     tokens, list = get_token_list(entity)
-    
+
     # Do the tagging.
     i = 0
-   isolated_token = entity.is_a?(Treat::Entities::Token)
+    isolated_token = entity.is_a?(Treat::Entities::Token)
+
     @@taggers[lang].apply(list).each do |tok|
       tokens[i].set :tag, tok.tag
-      tokens[i].set :tag_set, 
+      tokens[i].set :tag_set,
       options[:tag_set] if isolated_token
       return tok.tag if isolated_token
       i += 1
     end
 
-    # Handle tags for sentences and phrases.
-    if entity.is_a?(Treat::Entities::Sentence) ||
-      (entity.is_a?(Treat::Entities::Phrase) && 
-      !entity.parent_sentence)
-      
-        tag_set =  Treat::Universalisation::Tags::
-                    StanfordTagSetForLanguage[
-                   Treat::Languages.describe(lang)]
-        entity.set :tag_set, tag_set
-    end
-    
-    if entity.is_a?(Treat::Entities::Sentence)
-      return 'S'
-    elsif entity.is_a?(Treat::Entities::Phrase)
-      return 'P'
-    end
-
   end
-  
+
   # Initialize the tagger for a language.
-  def self.init_tagger(lang)
-    language = Treat::Languages.describe(lang)
+  def self.init_tagger(language)
     Treat::Loaders::Stanford.load(language)
     model = StanfordCoreNLP::Config::Models[:pos][language]
-    model = Treat::Loaders::Stanford.model_path +
+    model = Treat.paths.models + 'stanford/' +
     StanfordCoreNLP::Config::ModelFolders[:pos] + model
-    @@taggers[lang] ||= 
+    @@taggers[language] ||=
     StanfordCoreNLP::MaxentTagger.new(model)
   end
-  
+
   # Handle the options for the tagger.
-  def self.get_options(options, lang)
-    language = Treat::Languages.describe(lang)
+  def self.get_options(options, language)
     options = DefaultOptions.merge(options)
-    options[:tag_set] = 
-    StanfordCoreNLP::Config::TagSets[language]
     if options[:tagger_model]
       ::StanfordCoreNLP.set_model('pos.model',
       options[:tagger_model])
     end
-    options[:tag_set] = 
+    options[:tag_set] =
     StanfordCoreNLP::Config::TagSets[language]
     options
   end
-  
+
   # Retrieve a Java ArrayList object.
   def self.get_token_list(entity)
     list = StanfordCoreNLP::ArrayList.new
@@ -95,5 +84,5 @@ class Treat::Lexicalizers::Taggers::Stanford
     end
     return tokens, list
   end
-  
-end
+
+end

data/lib/treat/workers/processors/chunkers/autoselect.rb

@@ -0,0 +1,19 @@
+class Treat::Workers::Processors::Chunkers::Autoselect
+
+  def self.chunk(entity, options = {})
+    unless entity.has?(:format)
+      raise Treat::Exception,
+      "Must have a format to autoselect chunker."
+    end
+    begin
+      k = Treat::Workers::Processors::
+      Chunkers.const_get(cc(entity.format))
+      k.chunk(entity, options)
+    rescue Treat::Exception
+      Treat::Workers::Processors::
+      Chunkers::TXT.chunk(entity, options)
+    end
+    
+  end
+
+end