shalmaneser-rosy 1.2.0.rc4 → 1.2.rc5

data/lib/rosy/RosyPruning.rb

@@ -8,38 +8,44 @@
 # Pruning currently available:
 # Both Xue/Palmer original and a modified version for FrameNet
 
-require "common/ruby_class_extensions"
+require "ruby_class_extensions"
 
 require "rosy/RosyFeatureExtractors"
-require "common/RosyConventions"
-require "rosy/rosy_config_data"
+# require "RosyConventions"
+require 'value_restriction'
+require 'configuration/rosy_config_data'
 require "rosy/RosyIterator"
 
 ###
 # Pruning, derived from the Xue/Palmer algorithm
 #
 # implemented in the Interpreter Class of each individual parser
+module Shalmaneser
+module Rosy
 class PruneFeature < RosySingleFeatureExtractor
-  PruneFeature.announce_me()
+  PruneFeature.announce_me
 
-  def PruneFeature.feature_name()
-    return "prune"
+  def self.feature_name
+    "prune"
   end
-  def PruneFeature.sql_type()
-    return "TINYINT"
+
+  def self.sql_type
+    "TINYINT"
   end
-  def PruneFeature.feature_type()
-    return "syn"
+
+  def self.feature_type
+    'syn'
   end
-  def PruneFeature.info()
+
+  def self.info
     # additional info: I am an index feature
-    return super().concat(["index"])
+    super().concat(["index"])
   end
 
   ################
   private
 
-  def compute_feature_instanceOK()
+  def compute_feature_instanceOK
     retv = @@interpreter_class.prune?(@@node, @@paths, @@terminals_ordered)
     if [0, 1].include? retv
       return retv
@@ -52,18 +58,18 @@ end
 ####################
 # HIER changeme
 class TigerPruneFeature < RosySingleFeatureExtractor
-  TigerPruneFeature.announce_me()
+  TigerPruneFeature.announce_me
 
-  def TigerPruneFeature.feature_name()
+  def TigerPruneFeature.feature_name
     return "tiger_prune"
   end
-  def TigerPruneFeature.sql_type()
+  def TigerPruneFeature.sql_type
     return "TINYINT"
   end
-  def TigerPruneFeature.feature_type()
+  def TigerPruneFeature.feature_type
     return "syn"
   end
-  def TigerPruneFeature.info()
+  def TigerPruneFeature.info
     # additional info: I am an index feature
     return super().concat(["index"])
   end
@@ -71,7 +77,7 @@ class TigerPruneFeature < RosySingleFeatureExtractor
   ################
   private
 
-  def compute_feature_instanceOK()
+  def compute_feature_instanceOK
     if @@changeme_tiger_include.include? @@node
       return 1
     else
@@ -84,9 +90,9 @@ end
 
 
 #######################3
-# Pruning: 
-# packaging all methods that will be needed to 
-# implement it, 
+# Pruning:
+# packaging all methods that will be needed to
+# implement it,
 # given that the xp_prune feature defined above
 # has been computed for each constituent during featurization.
 class Pruning
@@ -110,14 +116,14 @@ class Pruning
       return exp.get("prune")
     else
       return nil
-    end               
+    end
   end
 
   ###
-  # make ValueRestriction according to the pruning option set in 
+  # make ValueRestriction according to the pruning option set in
   # the experiment file:
   #       WHERE <pruning_column_name> = 1
-  # where <pruning_column_name> is the name of one of the 
+  # where <pruning_column_name> is the name of one of the
   # pruning features defined above, the same name that has
   # been set as the value of the pruning parameter in the experiment file
   #
@@ -133,10 +139,10 @@ class Pruning
 
   ###
   # given the name of a DB table column and an iterator that
-  # iterates over some data, 
+  # iterates over some data,
   # assuming that the column describes some classifier run results,
   # choose all rows where the pruning column is 0 (i.e. all instances
-  # that have been pruned away) and set the value of the given column 
+  # that have been pruned away) and set the value of the given column
   # to noval for them all, marking them as "not assigned any role".
   def Pruning.integrate_pruning_into_run(run_column, # string: run column name
                                          iterator,   # RosyIterator object
@@ -145,21 +151,23 @@ class Pruning
       # no pruning activated
       return
     end
-                          
+
     iterator.each_group { |group_descr_hash, group|
       # get a view of all instances for which prune == 0, i.e. that have been pruned away
       view = iterator.get_a_view_for_current_group(
-                                                   [run_column], 
+                                                   [run_column],
                                                    [ValueRestriction.new(Pruning.colname(exp), 0)]
                                                    )
       # make a list of column values that are all noval
-      all_noval = Array.new
+      all_noval = []
       view.each_instance_s { |inst|
         all_noval << exp.get("noval")
       }
       # and set all selected instances to noval
       view.update_column(run_column, all_noval)
-      view.close()
+      view.close
     }
   end
 end
+end
+end

data/lib/rosy/RosyServices.rb

@@ -5,25 +5,26 @@
 # remove database tables and experiments,
 # dump experiment to files and load from files
 
-require "common/ruby_class_extensions"
+require "ruby_class_extensions"
 
 # Rosy packages
-require "common/RosyConventions"
+require 'rosy/rosy_conventions'
 require "rosy/RosyIterator"
 require "rosy/RosySplit"
 require "rosy/RosyTask"
 require "rosy/RosyTrainingTestTable"
-require "rosy/View"
+# require "rosy/View"
 
 # Frprep packages
-require "common/prep_config_data"
-
+require 'configuration/frappe_config_data'
+module Shalmaneser
+module Rosy
 ###################################################
 class RosyServices < RosyTask
 
   def initialize(exp,      # RosyConfigData object: experiment description
-		 opts,     # hash: runtime argument option (string) -> value (string)
-		 ttt_obj)  # RosyTrainingTestTable object
+                 opts,     # hash: runtime argument option (string) -> value (string)
+                 ttt_obj)  # RosyTrainingTestTable object
 
     ##
     # remember the experiment description
@@ -34,27 +35,24 @@ class RosyServices < RosyTask
     ##
     # check runtime options
 
-    @tasks = Array.new
+    @tasks = []
     # defaults:
     @step = "onestep"
     @splitID = nil
-    @testID = default_test_ID()
+    @testID = Rosy.default_test_ID
 
 
     opts.each do |opt,arg|
       case opt
       when "--deltable", "--delexp", "--delruns", "--delsplit", "--deltables"
-        #####
-        # In enduser mode, you cannot delete things
-        in_enduser_mode_unavailable()
-	@tasks << [opt, arg]
+        @tasks << [opt, arg]
       when "--dump", "--load", "--writefeatures"
-	@tasks << [opt, arg]
+        @tasks << [opt, arg]
       when "--step"
-	unless ["argrec", "arglab", "both", "onestep"].include? arg
-	  raise "Classification step must be one of: argrec, arglab, both, onestep. I got: " + arg.to_s
-	end
-	@step = arg
+        unless ["argrec", "arglab", "both", "onestep"].include? arg
+          raise "Classification step must be one of: argrec, arglab, both, onestep. I got: " + arg.to_s
+        end
+        @step = arg
 
       when "--logID"
         @splitID = arg
@@ -63,8 +61,8 @@ class RosyServices < RosyTask
         @testID = arg
 
       else
-	# this is an option that is okay but has already been read and used by rosy.rb
-      end	
+        # this is an option that is okay but has already been read and used by rosy.rb
+      end
     end
     # announce the task
     $stderr.puts "---------"
@@ -76,17 +74,17 @@ class RosyServices < RosyTask
   # perform
   #
   # do each of the inspection tasks set as options
-  def perform()
+  def perform
     @tasks.each { |opt, arg|
       case opt
       when "--deltable"
         del_table(arg)
       when "--deltables"
-        del_tables()
+        del_tables
       when "--delexp"
-        del_experiment()
+        del_experiment
       when "--delruns"
-        del_runs()
+        del_runs
       when "--delsplit"
         del_split(arg)
       when "--dump"
@@ -94,14 +92,14 @@ class RosyServices < RosyTask
       when "--load"
         load_experiment(arg)
       when "--writefeatures"
- 	write_features(arg)
+        write_features(arg)
       end
     }
   end
 
   ################################
   private
-  
+
   #####
   # del_table
   #
@@ -110,14 +108,14 @@ class RosyServices < RosyTask
   # If the user gives an answer starting in "y", the table is deleted.
   def del_table(table_name) # string: name of DB table
     # check if we have this table
-    unless @ttt_obj.database.list_tables().include? table_name
+    unless @ttt_obj.database.list_tables.include? table_name
       $stderr.puts "Cannot find DB table #{table_name}."
       return
     end
 
     # really delete?
     $stderr.print "Really delete DB table #{table_name}? [y/n] "
-    answer = gets().chomp()
+    answer = gets.chomp
     unless answer =~ /^y/
       return
     end
@@ -139,12 +137,12 @@ class RosyServices < RosyTask
   # for all the tables in the database, present their name and size,
   # and ask if it should be deleted.
   # this is good for cleaning up!
-  
-  def del_tables() 
-    @ttt_obj.database.list_tables().each { |table_name|
+
+  def del_tables
+    @ttt_obj.database.list_tables.each { |table_name|
 
       STDERR.print "Delete table #{table_name} (num. rows #{@ttt_obj.database.num_rows(table_name)})? [y/n] "
-      answer = gets().chomp()
+      answer = gets.chomp
 
       if answer =~ /^y/
         deletion_worked = false
@@ -154,10 +152,10 @@ class RosyServices < RosyTask
         rescue
           deletion_worked = false
         end
-        if deletion_worked 
+        if deletion_worked
           STDERR.puts "Table #{name} removed."
         else
-          $stderr.puts "Error: Removal of #{name} failed."          
+          $stderr.puts "Error: Removal of #{name} failed."
         end
       end
     }
@@ -169,31 +167,31 @@ class RosyServices < RosyTask
   # remove the experiment described by the experiment file @exp
   # The method verifies whether the experiment should be deleted.
   # If the user gives an answer starting in "y", the experiment is deleted.
-  def del_experiment()
+  def del_experiment
     data_dir = File.new_dir(@exp.instantiate("rosy_dir", "exp_ID" => @exp.get("experiment_ID")))
 
     # no data? then don't do anything
     if not(@ttt_obj.train_table_exists?) and
-        @ttt_obj.testIDs().empty? and
-        @ttt_obj.splitIDs().empty? and
+        @ttt_obj.testIDs.empty? and
+        @ttt_obj.splitIDs.empty? and
         Dir[data_dir + "*"].empty?
       $stderr.puts "No data to delete for experiment #{@exp.get("experiment_ID")}."
       # we have just made the directory data_dir by calling @exp.new_dir
       # undo that
       %x{rmdir #{data_dir}}
       return
-    end       
-        
+    end
+
 
     # really delete?
     $stderr.print "Really delete experiment #{@exp.get("experiment_ID")}? [y/n] "
-    answer = gets().chomp()
+    answer = gets.chomp
     unless answer =~ /^y/
       return
     end
 
     # remove main table
-    @ttt_obj.remove_train_table()
+    @ttt_obj.remove_train_table
 
     # remove test tables
     @ttt_obj.testIDs.each { |testID|
@@ -218,17 +216,17 @@ class RosyServices < RosyTask
   # del_runs
   #
   # interactively remove runs from the current experiment
-  def del_runs()
+  def del_runs
     # iterate through all tables and runs
-    @ttt_obj.runlog_to_s_list().each { |table_descr|
+    @ttt_obj.runlog_to_s_list.each { |table_descr|
       unless table_descr["runlist"].empty?
         # print description of the table
         $stderr.puts table_descr["header"]
-        
+
         table_descr["runlist"].each { |run_id, run_descr|
           $stderr.puts run_descr
           $stderr.puts "Delete this run? [y/n] "
-          answer = gets().chomp()
+          answer = gets.chomp
           if answer =~ /^[yY]/
             @ttt_obj.delete_runlog(table_descr["table_name"], run_id)
           end
@@ -239,7 +237,7 @@ class RosyServices < RosyTask
 
   ##############
   # del_split
-  # 
+  #
   # remove the split with the given ID
   # from the current experiment:
   # delete split tables, remove from list of test and split tables
@@ -253,7 +251,7 @@ class RosyServices < RosyTask
 
     # really delete?
     $stderr.print "Really delete split #{splitID} of experiment #{@exp.get("experiment_ID")}? [y/n] "
-    answer = gets().chomp()
+    answer = gets.chomp
     unless answer =~ /^y/
       return
     end
@@ -264,7 +262,7 @@ class RosyServices < RosyTask
 
     # remove classifiers for split
     ["argrec", "arglab", "onestep"].each { |step|
-      classif_dir = classifier_directory_name(@exp,step, splitID)
+      classif_dir = Rosy::classifier_directory_name(@exp,step, splitID)
       %x{rm -rf #{classif_dir}}
     }
   end
@@ -283,7 +281,7 @@ class RosyServices < RosyTask
       dir = File.new_dir(directory)
     else
       # use the default directory: <rosy_dir>/tables
-      dir = File.new_dir(@exp.instantiate("rosy_dir", 
+      dir = File.new_dir(@exp.instantiate("rosy_dir",
                                           "exp_ID" => @exp.get("experiment_ID")),
                          "your_feature_files")
     end
@@ -292,7 +290,7 @@ class RosyServices < RosyTask
     ##
     # check: if this is about a split, do we have it?
     if @splitID
-      unless @ttt_obj.splitIDs().include?(@splitID)
+      unless @ttt_obj.splitIDs.include?(@splitID)
         $stderr.puts "Sorry, I have no data for split ID #{@splitID}."
         exit 1
       end
@@ -304,30 +302,30 @@ class RosyServices < RosyTask
       $stderr.puts "Writing data according to split '#{@splitID}'"
     elsif @testID
       # do we have this test set? else write only training set
-      if @ttt_obj.testIDs().include?(@testID)
-	$stderr.puts "Writing training data, and test data with ID '#{@testID}'"
+      if @ttt_obj.testIDs.include?(@testID)
+        $stderr.puts "Writing training data, and test data with ID '#{@testID}'"
       else
         $stderr.puts "Warning: no data for test ID '#{@testID}', writing only training data."
-	@testID = nil
+        @testID = nil
       end
     end
-    
+
     $stderr.puts "Writing data for classification step '#{@step}'."
     $stderr.puts
 
     ##
     # write training data
     $stderr.puts "Writing training sets"
-    iterator = RosyIterator.new(@ttt_obj, @exp, "train", 
-				"step" => @step, 
-				"splitID" => @splitID,
-				"prune" => true)
+    iterator = RosyIterator.new(@ttt_obj, @exp, "train",
+                                "step" => @step,
+                                "splitID" => @splitID,
+                                "prune" => true)
 
     # get the list of relevant features,
-    # remove the features that describe the unit by which we train, 
+    # remove the features that describe the unit by which we train,
     # since they are going to be constant throughout the training file
-    features = @ttt_obj.feature_info.get_model_features(@step) - 
-      iterator.get_xwise_column_names()
+    features = @ttt_obj.feature_info.get_model_features(@step) -
+      iterator.get_xwise_column_names
 
     # but add the gold feature
     unless features.include? "gold"
@@ -337,14 +335,14 @@ class RosyServices < RosyTask
 
     write_features_aux(dir, "training", @step, iterator, features)
 
-    ## 
+    ##
     # write test data
     if @testID
       $stderr.puts "Writing test sets"
       filename = dir + "test.data"
-      iterator = RosyIterator.new(@ttt_obj, @exp, "test", 
-                                  "step" => @step, 
-                                  "testID" => @testID, 
+      iterator = RosyIterator.new(@ttt_obj, @exp, "test",
+                                  "step" => @step,
+                                  "testID" => @testID,
                                   "splitID" => @splitID,
                                   "prune" => true)
       write_features_aux(dir, "test", @step, iterator, features)
@@ -354,39 +352,39 @@ class RosyServices < RosyTask
   ########
   # write_features_aux: actually do the writing
   def write_features_aux(dir,      # string: directory to write to
-			 dataset,  # string: training or test
-			 step,     # string: argrec, arglab, onestep
-			 iterator, # RosyIterator tuned to what we're writing
-			 features) # array:string: list of features to include in views
+                         dataset,  # string: training or test
+                         step,     # string: argrec, arglab, onestep
+                         iterator, # RosyIterator tuned to what we're writing
+                         features) # array:string: list of features to include in views
 
     # proceed one group at a time
     iterator.each_group { |group_descr_hash, group|
       # get data for this group
       view = iterator.get_a_view_for_current_group(features)
-      
+
       #filename: e.g. directory/training.Statement.data
-      filename = dir + dataset + "." + 
-	step + "." + 
-	group.gsub(/\s/, "_") + ".data"
+      filename = dir + dataset + "." +
+        step + "." +
+        group.gsub(/\s/, "_") + ".data"
 
       begin
-	file = File.new(filename, "w")
+        file = File.new(filename, "w")
       rescue
-	$stderr.puts "Error: Could not write to file #{filename}, exiting."
-	exit 1
+        $stderr.puts "Error: Could not write to file #{filename}, exiting."
+        exit 1
       end
 
       view.each_instance_s { |instance_string|
-	# change punctuation to _PUNCT_
-	# and change empty space to _
-	# because otherwise some classifiers may spit
-	file.puts prepare_output_for_classifiers(instance_string)
+        # change punctuation to _PUNCT_
+        # and change empty space to _
+        # because otherwise some classifiers may spit
+        file.puts Rosy::prepare_output_for_classifiers(instance_string)
       }
-      file.close()
-      view.close()
+      file.close
+      view.close
     }
   end
-  
+
   ##############3
   # dump_experiment
   #
@@ -412,7 +410,7 @@ class RosyServices < RosyTask
       dir = File.new_dir(directory)
     else
       # use the default directory: <rosy_dir>/tables
-      dir = File.new_dir(@exp.instantiate("rosy_dir", 
+      dir = File.new_dir(@exp.instantiate("rosy_dir",
                                           "exp_ID" => @exp.get("experiment_ID")),
                          "tables")
     end
@@ -420,7 +418,7 @@ class RosyServices < RosyTask
 
     ###
     # dump main table
-    
+
     $stderr.puts "Dumping main table"
     filename = dir + "main"
     begin
@@ -432,13 +430,13 @@ class RosyServices < RosyTask
 
     if @ttt_obj.train_table_exists?
       iterator = RosyIterator.new(@ttt_obj, @exp, "train", "xwise" => "frame")
-      table_obj = @ttt_obj.existing_train_table()
+      table_obj = @ttt_obj.existing_train_table
       aux_dump(iterator, file, table_obj)
     end
 
     ###
     # dump test tables
-    
+
     unless @ttt_obj.testIDs.empty?
       $stderr.print "Dumping test tables: "
     end
@@ -452,7 +450,7 @@ class RosyServices < RosyTask
         $stderr.puts "Sorry, couldn't write to #{filename}"
         return
       end
-      
+
       if @ttt_obj.test_table_exists?(testID)
         iterator = RosyIterator.new(@ttt_obj, @exp, "test", "testID" => testID, "xwise" => "frame")
         table_obj = @ttt_obj.existing_test_table(testID)
@@ -469,7 +467,7 @@ class RosyServices < RosyTask
     end
     @ttt_obj.splitIDs.each { |splitID|
       ["train", "test"].each { |dataset|
-        
+
         filename = dir + "split." + dataset + "." + splitID
         $stderr.print filename, " "
         begin
@@ -481,7 +479,7 @@ class RosyServices < RosyTask
 
         if @ttt_obj.split_table_exists?(splitID, dataset)
           iterator = RosyIterator.new(@ttt_obj, @exp, dataset, "splitID" => splitID, "xwise" => "frame")
-          table_obj = @ttt_obj.existing_split_table(splitID, dataset, RosySplit.split_index_colname())
+          table_obj = @ttt_obj.existing_split_table(splitID, dataset, RosySplit.split_index_colname)
           aux_dump(iterator, file, table_obj)
         end
       }
@@ -492,7 +490,7 @@ class RosyServices < RosyTask
 
     ###
     # dump classification run logs
-    @ttt_obj.to_file(dir)    
+    @ttt_obj.to_file(dir)
   end
 
   ################3
@@ -502,10 +500,10 @@ class RosyServices < RosyTask
   def aux_dump(iterator, # RosyIterator object, refers to table to write
                file, # stream: write to this file
                table_obj) # DB table to be written
-    
+
     # write all columns except the autoincrement index
     # columns_to_write: array:string*string column name, column SQL type
-    columns_to_write = Array.new()
+    columns_to_write = []
     @ttt_obj.database.list_column_formats(table_obj.table_name).each { |column_name, column_type|
       unless column_name == table_obj.index_name
         # check: when loading we make assumptions on the field types that can happen.
@@ -520,27 +518,27 @@ class RosyServices < RosyTask
       end
     }
     columns_as_array = columns_to_write.map { |name, type| name}
-    
+
     # write column names and types
     file.puts columns_to_write.map { |name, type| name }.join(",")
     file.puts columns_to_write.map { |name, type| type }.join(",")
-    
+
     # access groups and write data
-    
+
     iterator.each_group { |hash, framename|
       view = iterator.get_a_view_for_current_group(columns_as_array)
 
       # write instances
       view.each_hash { |instance|
-        file.puts columns_to_write.map { |name, type| 
+        file.puts columns_to_write.map { |name, type|
           # get column entries in order of column names
-          instance[name] 
+          instance[name]
         }.map { |entry|
           # remove commas
-          entry.to_s.gsub(/,/, "COMMA") 
+          entry.to_s.gsub(/,/, "COMMA")
         }.join(",")
       }
-      view.close()
+      view.close
     }
   end
 
@@ -567,7 +565,7 @@ class RosyServices < RosyTask
     $stderr.puts "Load experiment data from files into the current experiment:"
     $stderr.puts "This will overwrite existing data of experiment #{@exp.get("experiment_ID")}."
     $stderr.print "Proceed? [y/n] "
-    answer = gets().chomp()
+    answer = gets.chomp
     unless answer =~ /^y/
       return
     end
@@ -586,7 +584,8 @@ class RosyServices < RosyTask
       $stderr.puts "Parameter preproc_descr_file_train has to be a readable file."
       exit 1
     end
-    preproc_exp = FrPrepConfigData.new(preproc_expname)
+    # @note Remove this dependency.
+    preproc_exp = ::Shalmaneser::Configuration::FrappeConfigData.new(preproc_expname)
     @exp.adjoin(preproc_exp)
 
     ###
@@ -597,8 +596,8 @@ class RosyServices < RosyTask
       dir = File.existing_dir(directory)
     else
       # default: <rosy_dir>/tables
-      dir = File.existing_dir(@exp.instantiate("rosy_dir", 
-                                               "exp_ID" => @exp.get("experiment_ID")), 
+      dir = File.existing_dir(@exp.instantiate("rosy_dir",
+                                               "exp_ID" => @exp.get("experiment_ID")),
                               "tables")
     end
     $stderr.puts "Reading experiment data from directory " + dir
@@ -639,13 +638,13 @@ class RosyServices < RosyTask
 
         file = File.new(dir + filename)
         col_names, col_types = aux_read_colnames(file, nil)
-        table_obj = @ttt_obj.new_split_table(splitID, dataset, RosySplit.split_index_colname())
+        table_obj = @ttt_obj.new_split_table(splitID, dataset, RosySplit.split_index_colname)
         # write file contents to the DB table
         aux_transfer_to_table(file, table_obj, col_names, col_types)
 
       else
         # not a filename we recognize
-        # don't do anything with it        
+        # don't do anything with it
       end
     }
 
@@ -672,11 +671,11 @@ class RosyServices < RosyTask
     # sanity check: features here the same as in the experiment file?
     if exp_colnames
       feature_colnames = colnames.select { |c| c !~ /^#{@exp.get("classif_column_name")}/ }
-      unless feature_colnames.sort() == exp_colnames.sort()
+      unless feature_colnames.sort == exp_colnames.sort
         raise "Feature name mismatch!\nIn the experiment file, you have specified:\n" +
-            exp_colnames.sort().join(",") +
+            exp_colnames.sort.join(",") +
             "\nIn the table I'm reading from file I got:\n" +
-            feature_colnames.sort().join(",")
+            feature_colnames.sort.join(",")
       end
     else
       # no check of column name match requested
@@ -684,16 +683,16 @@ class RosyServices < RosyTask
     coltypes = aux_read_columns(file)
     return [colnames, coltypes]
   end
-                        
+
 
   ##
   # aux_transfer_columns
-  # 
+  #
   # auxiliary method for load_experiment:
   # read a line from file, split it at commas
   #   to arrive at the contents
   def aux_read_columns(file) # stream: file
-    line = file.gets()
+    line = file.gets
     if line.nil?
       return nil
     end
@@ -724,12 +723,12 @@ class RosyServices < RosyTask
     }
 
     # write file contents to the DB table
-    names_and_values = Array.new
+    names_and_values = []
     while row =  aux_read_columns(file)
-      names_and_values.clear()
+      names_and_values.clear
       col_names.each_with_index { |name, ix|
         unless row[ix].nil?
-          if col_types[ix] =~ /^(TINYINT|tinyint)/ 
+          if col_types[ix] =~ /^(TINYINT|tinyint)/
             # integer value: map!
             names_and_values << [name, row[ix].to_i]
           else
@@ -742,3 +741,5 @@ class RosyServices < RosyTask
     end
   end
  end
+end
+end