From 207f6f58185238e9cec7295536cb68548a553beb Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Fri, 2 Dec 2011 13:40:40 +0000
Subject: [PATCH] General: Work item 16359 - [Patch] faster
 stringFromColumnIndex()

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@83538 2327b42d-5241-43d6-9e2a-de5ac946f064
---
 Classes/PHPExcel/Cell.php | 41 ++++++++++++++++++++++++++++++---------
 changelog.txt             |  1 +
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/Classes/PHPExcel/Cell.php b/Classes/PHPExcel/Cell.php
index 24915fd..1fd865e 100644
--- a/Classes/PHPExcel/Cell.php
+++ b/Classes/PHPExcel/Cell.php
@@ -669,6 +669,14 @@ class PHPExcel_Cell
 	 */
 	public static function columnIndexFromString($pString = 'A')
 	{
+		//	Using a lookup cache adds a slight memory overhead, but boosts speed
+		//	caching using a static within the method is faster than a class static,
+		//		though it's additional memory overhead
+		static $_indexCache = array();
+
+		if (isset($_indexCache[$pString]))
+			return $_indexCache[$pString];
+
 		//	It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
 		//		and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
 		//		memory overhead either
@@ -683,11 +691,14 @@ class PHPExcel_Cell
 		//		for improved performance
 		if (isset($pString{0})) {
 			if (!isset($pString{1})) {
-				return $_columnLookup[$pString];
+				$_indexCache[$pString] = $_columnLookup[$pString];
+				return $_indexCache[$pString];
 			} elseif(!isset($pString{2})) {
-				return $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
+				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
+				return $_indexCache[$pString];
 			} elseif(!isset($pString{3})) {
-				return $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
+				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
+				return $_indexCache[$pString];
 			}
 		}
 		throw new Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty") . ".");
@@ -701,13 +712,25 @@ class PHPExcel_Cell
 	 */
 	public static function stringFromColumnIndex($pColumnIndex = 0)
 	{
-		// Determine column string
-		if ($pColumnIndex < 26) {
-			return chr(65 + $pColumnIndex);
-		} elseif ($pColumnIndex < 702) {
-			return chr(64 + ($pColumnIndex / 26)).chr(65 + $pColumnIndex % 26);
+		//	Using a lookup cache adds a slight memory overhead, but boosts speed
+		//	caching using a static within the method is faster than a class static,
+		//		though it's additional memory overhead
+		static $_indexCache = array();
+
+		if (!isset($_indexCache[$pColumnIndex])) {
+			// Determine column string
+			if ($pColumnIndex < 26) {
+				$_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
+			} elseif ($pColumnIndex < 702) {
+				$_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
+											  chr(65 + $pColumnIndex % 26);
+			} else {
+				$_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
+											  chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
+											  chr(65 + $pColumnIndex % 26);
+			}
 		}
-		return chr(64 + (($pColumnIndex - 26) / 676)).chr(65 + ((($pColumnIndex - 26) % 676) / 26)).chr(65 + $pColumnIndex % 26);
+		return $_indexCache[$pColumnIndex];
 	}
 
 	/**
diff --git a/changelog.txt b/changelog.txt
index 6a5594e..e29418b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -48,6 +48,7 @@ Fixed in SVN:
 - General:  (MBaker) Work item 16643 - Add file directory as a cache option for cache_to_discISAM
 - General:  (MBaker) Work item 16923 - Datatype.php & constant TYPE_NULL
 - General:  (MBaker) Ensure use of system temp directory for all temporary work files, unless explicitly specified
+- General:  (char101) Work item 16359 - [Patch] faster stringFromColumnIndex()
 
 
 2011-02-27 (v1.7.6):