[Octave-cvsupdate] SF.net SVN: octave:[7922] trunk/octave-forge/extra/dataframe/inst/@ dataframe

[<cde...@us...>]

Revision: 7922
          http://octave.svn.sourceforge.net/octave/?rev=7922&view=rev
Author:   cdemills
Date:     2010-11-16 18:01:31 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
Removed a typo: indi=>indr

Modified Paths:
--------------
    trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
    trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-11-16 17:28:54 UTC (rev 7921)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-11-16 18:01:31 UTC (rev 7922)
@@ -164,12 +164,12 @@
 	%# cut into lines -- include the EOL to have a one-to-one
 	%# matching between line numbers. Use a non-greedy match.
 	lines = regexp(in, ['.*?' eol], 'match');
-	dummy = cellfun(@(x) regexp(x, eol), lines);
+	dummy = cellfun(@(x) regexp(x, eol), lines); 
 	%# remove the EOL character(s)
 	lines(1==dummy) = {""};
 	%# use a positive lookahead -- eol is not part of the match
-	lines(dummy > 1) = cellfun(@(x) regexp(x, ['.*(?=' eol ')'], 'match'), \
-				   lines(dummy > 1));
+	lines(dummy > 1) = cellfun(@(x) regexp(x, ['.*?(?=' eol ')'], \
+					       'match'), lines(dummy > 1));
 	%# a field either starts at a word boundary, either by + - . for
 	%# a numeric data, either by ' for a string. 
 

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m	2010-11-16 17:28:54 UTC (rev 7921)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m	2010-11-16 18:01:31 UTC (rev 7922)
@@ -254,7 +254,7 @@
       endif
       dummy = dummy && (!isempty(cname) && size(cname{1}, 2) < 1);
       if dummy,
-	ridx = cell2mat(RHS(:, 1));
+	ridx = cell2mat(RHS(:, 1)); 
 	%# can it be converted to a list of unique numbers ?
 	if length(unique(ridx)) == length(ridx),
 	  ridx = RHS(:, 1); RHS = RHS(:, 2:end);
@@ -506,7 +506,7 @@
     if 1 == size(RHS, 1),
       dummy(indr) = ridx{1};
     else
-      dummy(indr) = vertcat(ridx{indi});
+      dummy(indr) = vertcat(ridx{indr});
     endif
     if length(unique(dummy)) != length(dummy), %# || \
 	  %# any(diff(dummy) <= 0),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.