optimus-ep 0.6.9 → 0.6.91

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.9.1 3/10/2008
+* Bug fix:
+  * Fix for parsing eprime log files in which leaf frames don't occur at the
+    highest log level
+
 == 0.6.9 2/25/2008
 * New features:
   * Supports parsing raw tab-delmimted files

data/lib/log_file_parser.rb

@@ -25,7 +25,6 @@ module Eprime
       
       attr_reader :frames
       attr_reader :levels
-      attr_reader :top_level
       # Valid things for the options hash:
       #   :columns => an array of strings, predefining the expected columns 
       #               (and their order)
@@ -37,8 +36,6 @@ module Eprime
         @force = options[:force]
         @file = file
         @levels = [''] # The 0 index should be blank.
-        @top_level = 0 # This is the level of the frame that'll 
-                       # generate output rows
         @found_cols = ColumnList.new()
       end
       
@@ -60,7 +57,7 @@ module Eprime
     
         @columns ||= @found_cols.names
         data = Eprime::Data.new(@columns)
-        self.top_frames.each do |frame|
+        self.leaf_frames.each do |frame|
           row = data.add_row
           @found_cols.names_with_cols.each do |pair|
             name, col = *pair
@@ -71,8 +68,8 @@ module Eprime
         return data
       end
       
-      def top_frames
-        return frames.find_all { |frame| frame.level == @top_level }
+      def leaf_frames
+        return frames.find_all { |frame| frame.leaf? }
       end
       
       # Define this as a column we *should not* include in out output.
@@ -102,7 +99,6 @@ module Eprime
           if !in_frame
             if key == LEVEL_KEY
               frame.level = val.to_i
-              @top_level = frame.level if frame.level > @top_level
             elsif key == FRAME_START
               in_frame = true
             end
@@ -166,6 +162,8 @@ module Eprime
       def set_parents!
         parents = []
         @frames.reverse_each do |frame|
+          child = parents[frame.level-1]
+          
           parents[frame.level] = frame
           frame.parent = parents[frame.level-1] # This will be nil for empty slots.
         end
@@ -176,13 +174,29 @@ module Eprime
         
         attr_accessor :level
         attr_accessor :parent
+        attr_accessor :children
         def initialize(parser)
           @level = nil
           @parent = nil
+          @children = []
           @data = Hash.new
           @parser = parser
         end
         
+        def parent=(new_parent)
+          if @parent
+            if new_parent != @parent
+              @parent.children.delete(self)
+            end
+          end
+          @parent = new_parent
+          @parent.children << self if @parent
+        end
+        
+        def leaf?
+          @children.empty?
+        end
+        
         # Methods to make this behave hashlike. Don't just delegate to 
         # the @data hash; that's less clear.
         def [](key)

data/lib/version.rb

@@ -2,7 +2,7 @@ module Eprime
   module VERSION
     MAJOR = 0
     MINOR = 6
-    TINY  = 9
+    TINY  = 91
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/log_file_parser_spec.rb

@@ -27,16 +27,16 @@ describe Eprime::Reader::LogfileParser do
       @reader.frames.detect{ |c| c.keys.size == 0}.should be_nil
     end
   
-    it "should have a level 3 frame at the start" do
-      @reader.frames.first.level.should == 3
+    it "should have a level 2 frame at the start" do
+      @reader.frames.first.level.should == 2
     end
   
     it "should have a level 1 frame at the end" do
       @reader.frames.last.level.should == 1
     end
   
-    it "should have a known TypeA key in first frame" do
-      @reader.frames.first["TypeA"].should_not be_nil
+    it "should have a known BlockTitle key in first frame" do
+      @reader.frames.first["BlockTitle"].should_not be_nil
     end
   
     it "should not have a known Gibberish key in first frame" do
@@ -55,12 +55,8 @@ describe Eprime::Reader::LogfileParser do
       @reader.levels.should include("Session")
     end
     
-    it "should find a top_level of 3" do
-      @reader.top_level.should == 3
-    end
-    
-    it "should have three top frames" do
-      @reader.top_frames.length.should == 3
+    it "should have four leaves" do
+      @reader.leaf_frames.length.should == 4
     end
   
     it "should have a parent in the first frame" do
@@ -72,8 +68,8 @@ describe Eprime::Reader::LogfileParser do
         @eprime = @reader.to_eprime
       end
     
-      it "should generate three rows from the example file" do
-        @eprime.length.should == 3
+      it "should generate four rows from the example file" do
+        @eprime.length.should == 4
       end
       
       it "should follow the column order in the example file" do
@@ -105,7 +101,7 @@ describe Eprime::Reader::LogfileParser do
     
       it "should compute task counters" do
         @eprime.first["Block"].should == 1
-        @eprime.last["Block"].should == 2
+        @eprime.last["Block"].should == 3
         @eprime.last["Trial"].should == 2
       end
     
@@ -131,8 +127,8 @@ describe Eprime::Reader::LogfileParser do
       @eprime.columns.first.should == "ExperimentName"
     end
     
-    it "should have three rows" do
-      @eprime.length.should == 3
+    it "should have four rows" do
+      @eprime.length.should == 4
     end
     
     

data/spec/samples/optimus_log.txt

@@ -19,20 +19,13 @@ Subject: 1
 Session: 1
 Display.RefreshRate: 60.000
 *** Header End ***
-		Level: 3
-		*** LogFrame Start ***
-		BlockList: 1
-		TypeA: Danger
-		TypeB: 2
-		Procedure: RunTrial
-		BlockList.Cycle: 1
-		BlockList.Sample: 1
-		Running: TestList
-		StartTime: 5000
-		Stim1.OnsetTime: 88684
-		Stim1.OffsetTime: 93583
-		CarriedVal: TrialLevel
-		*** LogFrame End ***
+	Level: 2
+	*** LogFrame Start ***
+	Procedure: Prep
+	Running: prepProc
+	CarriedVal: BlockLevel
+	BlockTitle: Prep
+	*** LogFrame End ***
 	Level: 2
 	*** LogFrame Start ***
 	BlockTitle: My Task

data/spec/spec_helper.rb

@@ -6,6 +6,30 @@
 # Imaging and Behavior, University of Wisconsin - Madison
 
 module EprimeTestHelper
+  
+  class RoundTrip
+    def initialize(expected)
+      @expected = expected
+    end
+    
+    def matches?(target)
+      @parsed = target.parse(@expected).to_s
+      @parsed == @expected
+    end
+    
+    def failure_message
+      "expected #{@parsed} to parse to #{@expected}"
+    end
+    
+    def negative_failure_message
+      "Expected #{@parsed} to not parse to #{@expected}"
+    end
+  end
+  
+  def round_trip(expected)
+    RoundTrip.new(expected)
+  end
+  
   unless constants.include?('SAMPLE_DIR')
     SAMPLE_DIR = File.join(File.dirname(__FILE__), 'samples')
     LOG_FILE = File.join(SAMPLE_DIR, 'optimus_log.txt')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: optimus-ep
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.6.91
 platform: ruby
 authors: 
 - Nathan Vack
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -06:00
+date: 2009-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency