poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r675795 - in /poi/branches/ooxml: ./ src/java/org/apache/poi/hssf/usermodel/ src/testcases/org/apache/poi/hssf/data/ src/testcases/org/apache/poi/hssf/usermodel/
Date Thu, 10 Jul 2008 22:57:14 GMT
Author: nick
Date: Thu Jul 10 15:57:13 2008
New Revision: 675795

URL: http://svn.apache.org/viewvc?rev=675795&view=rev
Log:
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,
 649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-65
 9571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675794
via svnmerge from 
https://svn.apache.org:443/repos/asf/poi/trunk

........
  r675783 | nick | 2008-07-10 23:14:25 +0100 (Thu, 10 Jul 2008) | 1 line
  
  Add disabled test for bug #45376
........
  r675785 | nick | 2008-07-10 23:22:24 +0100 (Thu, 10 Jul 2008) | 1 line
  
  Tweak test to run forward and back
........
  r675792 | nick | 2008-07-10 23:39:53 +0100 (Thu, 10 Jul 2008) | 1 line
  
  Improve javadocs relating to getLastRowNumber
........
  r675793 | nick | 2008-07-10 23:43:01 +0100 (Thu, 10 Jul 2008) | 1 line
  
  Add a test to show that the behaviour around bug #30635 is exactly as you would expect,
and the bug report is invalid
........

Added:
    poi/branches/ooxml/src/testcases/org/apache/poi/hssf/data/45376.xls
      - copied unchanged from r675793, poi/trunk/src/testcases/org/apache/poi/hssf/data/45376.xls
Modified:
    poi/branches/ooxml/   (props changed)
    poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
    poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
    poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java

Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 10 15:57:13 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-675776
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-675794

Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=675795&r1=675794&r2=675795&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Thu Jul 10 15:57:13
2008
@@ -365,18 +365,25 @@
     }
 
     /**
-     * gets the first row on the sheet
-     * @return the number of the first logical row on the sheet
+     * Gets the first row on the sheet
+     * @return the number of the first logical row on the sheet, zero based
      */
-
     public int getFirstRowNum()
     {
         return firstrow;
     }
 
     /**
-     * gets the last row on the sheet
-     * @return last row contained n this sheet.
+     * Gets the number last row on the sheet.
+     * Owing to idiosyncrasies in the excel file
+     *  format, if the result of calling this method
+     *  is zero, you can't tell if that means there 
+     *  are zero rows on the sheet, or one at
+     *  position zero. For that case, additionally
+     *  call {@link #getPhysicalNumberOfRows()} to
+     *  tell if there is a row at position zero
+     *  or not. 
+     * @return the number of the last row contained in this sheet, zero based.
      */
 
     public int getLastRowNum()

Modified: poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=675795&r1=675794&r2=675795&view=diff
==============================================================================
--- poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (original)
+++ poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Thu Jul 10
15:57:13 2008
@@ -1273,4 +1273,53 @@
         assertEquals("{=sin(B1:B9){9,1)[1][0]", nc2.getCellFormula());
         assertEquals("{=sin(B1:B9){9,1)[2][0]", nc3.getCellFormula());
     }
+    
+    /**
+     * People are all getting confused about the last
+     *  row and cell number
+     */
+    public void test30635() throws Exception {
+    	HSSFWorkbook wb = new HSSFWorkbook();
+    	HSSFSheet s = wb.createSheet();
+    	
+    	// No rows, everything is 0
+    	assertEquals(0, s.getFirstRowNum());
+    	assertEquals(0, s.getLastRowNum());
+    	assertEquals(0, s.getPhysicalNumberOfRows());
+    	
+    	// One row, most things are 0, physical is 1
+    	s.createRow(0);
+    	assertEquals(0, s.getFirstRowNum());
+    	assertEquals(0, s.getLastRowNum());
+    	assertEquals(1, s.getPhysicalNumberOfRows());
+    	
+    	// And another, things change
+    	s.createRow(4);
+    	assertEquals(0, s.getFirstRowNum());
+    	assertEquals(4, s.getLastRowNum());
+    	assertEquals(2, s.getPhysicalNumberOfRows());
+    	
+    	
+    	// Now start on cells
+    	HSSFRow r = s.getRow(0);
+    	assertEquals(-1, r.getFirstCellNum());
+    	assertEquals(-1, r.getLastCellNum());
+    	assertEquals(0, r.getPhysicalNumberOfCells());
+    	
+    	// Add a cell, things move off -1
+    	r.createCell((short)0);
+    	assertEquals(0, r.getFirstCellNum());
+    	assertEquals(1, r.getLastCellNum()); // last cell # + 1
+    	assertEquals(1, r.getPhysicalNumberOfCells());
+    	
+    	r.createCell((short)1);
+    	assertEquals(0, r.getFirstCellNum());
+    	assertEquals(2, r.getLastCellNum()); // last cell # + 1
+    	assertEquals(2, r.getPhysicalNumberOfCells());
+    	
+    	r.createCell((short)4);
+    	assertEquals(0, r.getFirstCellNum());
+    	assertEquals(5, r.getLastCellNum()); // last cell # + 1
+    	assertEquals(3, r.getPhysicalNumberOfCells());
+    }
 }

Modified: poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java?rev=675795&r1=675794&r2=675795&view=diff
==============================================================================
--- poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
(original)
+++ poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
Thu Jul 10 15:57:13 2008
@@ -294,4 +294,70 @@
 			throw e;
 		}
 	}
+	
+	/**
+	 * Apparently, each subsequent call takes longer, which is very
+	 *  odd.
+	 * We think it's because the formulas are recursive and crazy
+	 */
+	public void DISABLEDtestSlowEvaluate45376() throws Exception {
+		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("45376.xls");
+		
+		final String SHEET_NAME = "Eingabe";
+        final int row = 6;
+        final HSSFSheet sheet = wb.getSheet(SHEET_NAME);
+        
+        int firstCol = 4;
+        int lastCol = 14;
+        long[] timings = new long[lastCol-firstCol+1];
+        long[] rtimings = new long[lastCol-firstCol+1];
+        
+        long then, now;
+
+        final HSSFRow excelRow = sheet.getRow(row);
+        for(int i = firstCol; i <= lastCol; i++) {
+             final HSSFCell excelCell = excelRow.getCell(i);
+             final HSSFFormulaEvaluator evaluator = new
+                 HSSFFormulaEvaluator(sheet, wb);
+
+             evaluator.setCurrentRow(excelRow);
+             
+             now = System.currentTimeMillis();
+             evaluator.evaluate(excelCell);
+             then = System.currentTimeMillis();
+             timings[i-firstCol] = (then-now);
+             System.err.println("Col " + i + " took " + (then-now) + "ms");
+        }
+        for(int i = lastCol; i >= firstCol; i--) {
+            final HSSFCell excelCell = excelRow.getCell(i);
+            final HSSFFormulaEvaluator evaluator = new
+                HSSFFormulaEvaluator(sheet, wb);
+
+            evaluator.setCurrentRow(excelRow);
+            
+            now = System.currentTimeMillis();
+            evaluator.evaluate(excelCell);
+            then = System.currentTimeMillis();
+            rtimings[i-firstCol] = (then-now);
+            System.err.println("Col " + i + " took " + (then-now) + "ms");
+       }
+        
+        // The timings for each should be about the same
+        long avg = 0;
+        for(int i=0; i<timings.length; i++) {
+        	avg += timings[i];
+        }
+        avg = (long)( ((double)avg) / timings.length );
+        
+        // Warn if any took more then 1.5 the average
+        // TODO - replace with assert or similar
+        for(int i=0; i<timings.length; i++) {
+        	if(timings[i] > 1.5*avg) {
+        		System.err.println("Doing col " + (i+firstCol) + 
+        				" took " + timings[i] + "ms, vs avg " + 
+        				avg + "ms"
+        		);
+        	}
+        }
+	}
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message