lib/writers/stimtimes_writer.rb in optimus-ep-0.6.91 vs lib/writers/stimtimes_writer.rb in optimus-ep-0.8.0

@@ -1,20 +1,20 @@
 # Part of the Optimus package for managing E-Prime data
 # 
-# Copyright (C) 2008 Board of Regents of the University of Wisconsin System
+# Copyright (C) 2008-09 Board of Regents of the University of Wisconsin System
 # 
 # Written by Nathan Vack <[e-mail]>, at the Waisman Laborotory for Brain
 # Imaging and Behavior, University of Wisconsin - Madison
 
 # This class is a bit ugly around the edges -- I'm not quite sure how to
 # architect it, yet.
 
-require 'eprime'
+require 'optimus'
 require 'transformers/column_calculator'
 require 'transformers/row_filter'
 
-module Eprime
+module Optimus
   class StimtimesWriter
     include Transformers
     
     @@computed_columns = []
     @@counter_columns = []
@@ -23,14 +23,14 @@
     @@run_column = ''
     @@output_files = []
     
     def initialize(argv)
       # Look through our necessary class variables and do some odd stuff
-      edata = Eprime::Data.new
+      edata = Optimus::Data.new
       argv.each do |filename|
         File.open(filename, 'r') do |f|
-          reader = Eprime::Reader.new(f)
-          edata.merge!(reader.eprime_data)
+          reader = Optimus::Reader.new(f)
+          edata.merge!(reader.optimus_data)
         end
         
         @calc = ColumnCalculator.new
         @calc.data = edata
         @@computed_columns.each do |coldata|
\ No newline at end of file