From 003c25980193e14b08ecdfc3bf6d1b43ba877900 Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Sat, 23 May 2015 23:41:38 +0100 Subject: [PATCH] Modifying a few constants to psr-2 standards --- Classes/PHPExcel/Reader/Excel5.php | 324 +++++++++--------- Classes/PHPExcel/Reader/Excel5/MD5.php | 16 +- .../Shared/JAMA/CholeskyDecomposition.php | 6 +- .../PHPExcel/Shared/JAMA/LUDecomposition.php | 14 +- Classes/PHPExcel/Shared/JAMA/Matrix.php | 130 +++---- .../PHPExcel/Shared/JAMA/QRDecomposition.php | 10 +- Classes/PHPExcel/Shared/JAMA/utils/Error.php | 64 ++-- Classes/PHPExcel/Shared/JAMA/utils/Maths.php | 2 +- 8 files changed, 283 insertions(+), 283 deletions(-) diff --git a/Classes/PHPExcel/Reader/Excel5.php b/Classes/PHPExcel/Reader/Excel5.php index 50cc87e..498e985 100644 --- a/Classes/PHPExcel/Reader/Excel5.php +++ b/Classes/PHPExcel/Reader/Excel5.php @@ -74,80 +74,80 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce const XLS_Worksheet = 0x0010; // record identifiers - const XLS_Type_FORMULA = 0x0006; - const XLS_Type_EOF = 0x000a; - const XLS_Type_PROTECT = 0x0012; - const XLS_Type_OBJECTPROTECT = 0x0063; - const XLS_Type_SCENPROTECT = 0x00dd; - const XLS_Type_PASSWORD = 0x0013; - const XLS_Type_HEADER = 0x0014; - const XLS_Type_FOOTER = 0x0015; - const XLS_Type_EXTERNSHEET = 0x0017; - const XLS_Type_DEFINEDNAME = 0x0018; - const XLS_Type_VERTICALPAGEBREAKS = 0x001a; - const XLS_Type_HORIZONTALPAGEBREAKS = 0x001b; - const XLS_Type_NOTE = 0x001c; - const XLS_Type_SELECTION = 0x001d; - const XLS_Type_DATEMODE = 0x0022; - const XLS_Type_EXTERNNAME = 0x0023; - const XLS_Type_LEFTMARGIN = 0x0026; - const XLS_Type_RIGHTMARGIN = 0x0027; - const XLS_Type_TOPMARGIN = 0x0028; - const XLS_Type_BOTTOMMARGIN = 0x0029; - const XLS_Type_PRINTGRIDLINES = 0x002b; - const XLS_Type_FILEPASS = 0x002f; - const XLS_Type_FONT = 0x0031; - const XLS_Type_CONTINUE = 0x003c; - const XLS_Type_PANE = 0x0041; - const XLS_Type_CODEPAGE = 0x0042; - const XLS_Type_DEFCOLWIDTH = 0x0055; - const XLS_Type_OBJ = 0x005d; - const XLS_Type_COLINFO = 0x007d; - const XLS_Type_IMDATA = 0x007f; - const XLS_Type_SHEETPR = 0x0081; - const XLS_Type_HCENTER = 0x0083; - const XLS_Type_VCENTER = 0x0084; - const XLS_Type_SHEET = 0x0085; - const XLS_Type_PALETTE = 0x0092; - const XLS_Type_SCL = 0x00a0; - const XLS_Type_PAGESETUP = 0x00a1; - const XLS_Type_MULRK = 0x00bd; - const XLS_Type_MULBLANK = 0x00be; - const XLS_Type_DBCELL = 0x00d7; - const XLS_Type_XF = 0x00e0; - const XLS_Type_MERGEDCELLS = 0x00e5; - const XLS_Type_MSODRAWINGGROUP = 0x00eb; - const XLS_Type_MSODRAWING = 0x00ec; - const XLS_Type_SST = 0x00fc; - const XLS_Type_LABELSST = 0x00fd; - const XLS_Type_EXTSST = 0x00ff; - const XLS_Type_EXTERNALBOOK = 0x01ae; - const XLS_Type_DATAVALIDATIONS = 0x01b2; - const XLS_Type_TXO = 0x01b6; - const XLS_Type_HYPERLINK = 0x01b8; - const XLS_Type_DATAVALIDATION = 0x01be; - const XLS_Type_DIMENSION = 0x0200; - const XLS_Type_BLANK = 0x0201; - const XLS_Type_NUMBER = 0x0203; - const XLS_Type_LABEL = 0x0204; - const XLS_Type_BOOLERR = 0x0205; - const XLS_Type_STRING = 0x0207; - const XLS_Type_ROW = 0x0208; - const XLS_Type_INDEX = 0x020b; - const XLS_Type_ARRAY = 0x0221; - const XLS_Type_DEFAULTROWHEIGHT = 0x0225; - const XLS_Type_WINDOW2 = 0x023e; - const XLS_Type_RK = 0x027e; - const XLS_Type_STYLE = 0x0293; - const XLS_Type_FORMAT = 0x041e; - const XLS_Type_SHAREDFMLA = 0x04bc; - const XLS_Type_BOF = 0x0809; - const XLS_Type_SHEETPROTECTION = 0x0867; - const XLS_Type_RANGEPROTECTION = 0x0868; - const XLS_Type_SHEETLAYOUT = 0x0862; - const XLS_Type_XFEXT = 0x087d; - const XLS_Type_PAGELAYOUTVIEW = 0x088b; - const XLS_Type_UNKNOWN = 0xffff; + const XLS_TYPE_FORMULA = 0x0006; + const XLS_TYPE_EOF = 0x000a; + const XLS_TYPE_PROTECT = 0x0012; + const XLS_TYPE_OBJECTPROTECT = 0x0063; + const XLS_TYPE_SCENPROTECT = 0x00dd; + const XLS_TYPE_PASSWORD = 0x0013; + const XLS_TYPE_HEADER = 0x0014; + const XLS_TYPE_FOOTER = 0x0015; + const XLS_TYPE_EXTERNSHEET = 0x0017; + const XLS_TYPE_DEFINEDNAME = 0x0018; + const XLS_TYPE_VERTICALPAGEBREAKS = 0x001a; + const XLS_TYPE_HORIZONTALPAGEBREAKS = 0x001b; + const XLS_TYPE_NOTE = 0x001c; + const XLS_TYPE_SELECTION = 0x001d; + const XLS_TYPE_DATEMODE = 0x0022; + const XLS_TYPE_EXTERNNAME = 0x0023; + const XLS_TYPE_LEFTMARGIN = 0x0026; + const XLS_TYPE_RIGHTMARGIN = 0x0027; + const XLS_TYPE_TOPMARGIN = 0x0028; + const XLS_TYPE_BOTTOMMARGIN = 0x0029; + const XLS_TYPE_PRINTGRIDLINES = 0x002b; + const XLS_TYPE_FILEPASS = 0x002f; + const XLS_TYPE_FONT = 0x0031; + const XLS_TYPE_CONTINUE = 0x003c; + const XLS_TYPE_PANE = 0x0041; + const XLS_TYPE_CODEPAGE = 0x0042; + const XLS_TYPE_DEFCOLWIDTH = 0x0055; + const XLS_TYPE_OBJ = 0x005d; + const XLS_TYPE_COLINFO = 0x007d; + const XLS_TYPE_IMDATA = 0x007f; + const XLS_TYPE_SHEETPR = 0x0081; + const XLS_TYPE_HCENTER = 0x0083; + const XLS_TYPE_VCENTER = 0x0084; + const XLS_TYPE_SHEET = 0x0085; + const XLS_TYPE_PALETTE = 0x0092; + const XLS_TYPE_SCL = 0x00a0; + const XLS_TYPE_PAGESETUP = 0x00a1; + const XLS_TYPE_MULRK = 0x00bd; + const XLS_TYPE_MULBLANK = 0x00be; + const XLS_TYPE_DBCELL = 0x00d7; + const XLS_TYPE_XF = 0x00e0; + const XLS_TYPE_MERGEDCELLS = 0x00e5; + const XLS_TYPE_MSODRAWINGGROUP = 0x00eb; + const XLS_TYPE_MSODRAWING = 0x00ec; + const XLS_TYPE_SST = 0x00fc; + const XLS_TYPE_LABELSST = 0x00fd; + const XLS_TYPE_EXTSST = 0x00ff; + const XLS_TYPE_EXTERNALBOOK = 0x01ae; + const XLS_TYPE_DATAVALIDATIONS = 0x01b2; + const XLS_TYPE_TXO = 0x01b6; + const XLS_TYPE_HYPERLINK = 0x01b8; + const XLS_TYPE_DATAVALIDATION = 0x01be; + const XLS_TYPE_DIMENSION = 0x0200; + const XLS_TYPE_BLANK = 0x0201; + const XLS_TYPE_NUMBER = 0x0203; + const XLS_TYPE_LABEL = 0x0204; + const XLS_TYPE_BOOLERR = 0x0205; + const XLS_TYPE_STRING = 0x0207; + const XLS_TYPE_ROW = 0x0208; + const XLS_TYPE_INDEX = 0x020b; + const XLS_TYPE_ARRAY = 0x0221; + const XLS_TYPE_DEFAULTROWHEIGHT = 0x0225; + const XLS_TYPE_WINDOW2 = 0x023e; + const XLS_TYPE_RK = 0x027e; + const XLS_TYPE_STYLE = 0x0293; + const XLS_TYPE_FORMAT = 0x041e; + const XLS_TYPE_SHAREDFMLA = 0x04bc; + const XLS_TYPE_BOF = 0x0809; + const XLS_TYPE_SHEETPROTECTION = 0x0867; + const XLS_TYPE_RANGEPROTECTION = 0x0868; + const XLS_TYPE_SHEETLAYOUT = 0x0862; + const XLS_TYPE_XFEXT = 0x087d; + const XLS_TYPE_PAGELAYOUTVIEW = 0x088b; + const XLS_TYPE_UNKNOWN = 0xffff; // Encryption type const MS_BIFF_CRYPTO_NONE = 0; @@ -474,13 +474,13 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $code = self::getInt2d($this->data, $this->pos); switch ($code) { - case self::XLS_Type_BOF: + case self::XLS_TYPE_BOF: $this->readBof(); break; - case self::XLS_Type_SHEET: + case self::XLS_TYPE_SHEET: $this->readSheet(); break; - case self::XLS_Type_EOF: + case self::XLS_TYPE_EOF: $this->readDefault(); break 2; default: @@ -532,13 +532,13 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $code = self::getInt2d($this->data, $this->pos); switch ($code) { - case self::XLS_Type_BOF: + case self::XLS_TYPE_BOF: $this->readBof(); break; - case self::XLS_Type_SHEET: + case self::XLS_TYPE_SHEET: $this->readSheet(); break; - case self::XLS_Type_EOF: + case self::XLS_TYPE_EOF: $this->readDefault(); break 2; default: @@ -569,12 +569,12 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $code = self::getInt2d($this->data, $this->pos); switch ($code) { - case self::XLS_Type_RK: - case self::XLS_Type_LABELSST: - case self::XLS_Type_NUMBER: - case self::XLS_Type_FORMULA: - case self::XLS_Type_BOOLERR: - case self::XLS_Type_LABEL: + case self::XLS_TYPE_RK: + case self::XLS_TYPE_LABELSST: + case self::XLS_TYPE_NUMBER: + case self::XLS_TYPE_FORMULA: + case self::XLS_TYPE_BOOLERR: + case self::XLS_TYPE_LABEL: $length = self::getInt2d($this->data, $this->pos + 2); $recordData = $this->readRecordData($this->data, $this->pos + 4, $length); @@ -587,10 +587,10 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex); $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex); break; - case self::XLS_Type_BOF: + case self::XLS_TYPE_BOF: $this->readBof(); break; - case self::XLS_Type_EOF: + case self::XLS_TYPE_EOF: $this->readDefault(); break 2; default: @@ -659,58 +659,58 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $code = self::getInt2d($this->data, $this->pos); switch ($code) { - case self::XLS_Type_BOF: + case self::XLS_TYPE_BOF: $this->readBof(); break; - case self::XLS_Type_FILEPASS: + case self::XLS_TYPE_FILEPASS: $this->readFilepass(); break; - case self::XLS_Type_CODEPAGE: + case self::XLS_TYPE_CODEPAGE: $this->readCodepage(); break; - case self::XLS_Type_DATEMODE: + case self::XLS_TYPE_DATEMODE: $this->readDateMode(); break; - case self::XLS_Type_FONT: + case self::XLS_TYPE_FONT: $this->readFont(); break; - case self::XLS_Type_FORMAT: + case self::XLS_TYPE_FORMAT: $this->readFormat(); break; - case self::XLS_Type_XF: + case self::XLS_TYPE_XF: $this->readXf(); break; - case self::XLS_Type_XFEXT: + case self::XLS_TYPE_XFEXT: $this->readXfExt(); break; - case self::XLS_Type_STYLE: + case self::XLS_TYPE_STYLE: $this->readStyle(); break; - case self::XLS_Type_PALETTE: + case self::XLS_TYPE_PALETTE: $this->readPalette(); break; - case self::XLS_Type_SHEET: + case self::XLS_TYPE_SHEET: $this->readSheet(); break; - case self::XLS_Type_EXTERNALBOOK: + case self::XLS_TYPE_EXTERNALBOOK: $this->readExternalBook(); break; - case self::XLS_Type_EXTERNNAME: + case self::XLS_TYPE_EXTERNNAME: $this->readExternName(); break; - case self::XLS_Type_EXTERNSHEET: + case self::XLS_TYPE_EXTERNSHEET: $this->readExternSheet(); break; - case self::XLS_Type_DEFINEDNAME: + case self::XLS_TYPE_DEFINEDNAME: $this->readDefinedName(); break; - case self::XLS_Type_MSODRAWINGGROUP: + case self::XLS_TYPE_MSODRAWINGGROUP: $this->readMsoDrawingGroup(); break; - case self::XLS_Type_SST: + case self::XLS_TYPE_SST: $this->readSst(); break; - case self::XLS_Type_EOF: + case self::XLS_TYPE_EOF: $this->readDefault(); break 2; default: @@ -831,161 +831,161 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $code = self::getInt2d($this->data, $this->pos); switch ($code) { - case self::XLS_Type_BOF: + case self::XLS_TYPE_BOF: $this->readBof(); break; - case self::XLS_Type_PRINTGRIDLINES: + case self::XLS_TYPE_PRINTGRIDLINES: $this->readPrintGridlines(); break; - case self::XLS_Type_DEFAULTROWHEIGHT: + case self::XLS_TYPE_DEFAULTROWHEIGHT: $this->readDefaultRowHeight(); break; - case self::XLS_Type_SHEETPR: + case self::XLS_TYPE_SHEETPR: $this->readSheetPr(); break; - case self::XLS_Type_HORIZONTALPAGEBREAKS: + case self::XLS_TYPE_HORIZONTALPAGEBREAKS: $this->readHorizontalPageBreaks(); break; - case self::XLS_Type_VERTICALPAGEBREAKS: + case self::XLS_TYPE_VERTICALPAGEBREAKS: $this->readVerticalPageBreaks(); break; - case self::XLS_Type_HEADER: + case self::XLS_TYPE_HEADER: $this->readHeader(); break; - case self::XLS_Type_FOOTER: + case self::XLS_TYPE_FOOTER: $this->readFooter(); break; - case self::XLS_Type_HCENTER: + case self::XLS_TYPE_HCENTER: $this->readHcenter(); break; - case self::XLS_Type_VCENTER: + case self::XLS_TYPE_VCENTER: $this->readVcenter(); break; - case self::XLS_Type_LEFTMARGIN: + case self::XLS_TYPE_LEFTMARGIN: $this->readLeftMargin(); break; - case self::XLS_Type_RIGHTMARGIN: + case self::XLS_TYPE_RIGHTMARGIN: $this->readRightMargin(); break; - case self::XLS_Type_TOPMARGIN: + case self::XLS_TYPE_TOPMARGIN: $this->readTopMargin(); break; - case self::XLS_Type_BOTTOMMARGIN: + case self::XLS_TYPE_BOTTOMMARGIN: $this->readBottomMargin(); break; - case self::XLS_Type_PAGESETUP: + case self::XLS_TYPE_PAGESETUP: $this->readPageSetup(); break; - case self::XLS_Type_PROTECT: + case self::XLS_TYPE_PROTECT: $this->readProtect(); break; - case self::XLS_Type_SCENPROTECT: + case self::XLS_TYPE_SCENPROTECT: $this->readScenProtect(); break; - case self::XLS_Type_OBJECTPROTECT: + case self::XLS_TYPE_OBJECTPROTECT: $this->readObjectProtect(); break; - case self::XLS_Type_PASSWORD: + case self::XLS_TYPE_PASSWORD: $this->readPassword(); break; - case self::XLS_Type_DEFCOLWIDTH: + case self::XLS_TYPE_DEFCOLWIDTH: $this->readDefColWidth(); break; - case self::XLS_Type_COLINFO: + case self::XLS_TYPE_COLINFO: $this->readColInfo(); break; - case self::XLS_Type_DIMENSION: + case self::XLS_TYPE_DIMENSION: $this->readDefault(); break; - case self::XLS_Type_ROW: + case self::XLS_TYPE_ROW: $this->readRow(); break; - case self::XLS_Type_DBCELL: + case self::XLS_TYPE_DBCELL: $this->readDefault(); break; - case self::XLS_Type_RK: + case self::XLS_TYPE_RK: $this->readRk(); break; - case self::XLS_Type_LABELSST: + case self::XLS_TYPE_LABELSST: $this->readLabelSst(); break; - case self::XLS_Type_MULRK: + case self::XLS_TYPE_MULRK: $this->readMulRk(); break; - case self::XLS_Type_NUMBER: + case self::XLS_TYPE_NUMBER: $this->readNumber(); break; - case self::XLS_Type_FORMULA: + case self::XLS_TYPE_FORMULA: $this->readFormula(); break; - case self::XLS_Type_SHAREDFMLA: + case self::XLS_TYPE_SHAREDFMLA: $this->readSharedFmla(); break; - case self::XLS_Type_BOOLERR: + case self::XLS_TYPE_BOOLERR: $this->readBoolErr(); break; - case self::XLS_Type_MULBLANK: + case self::XLS_TYPE_MULBLANK: $this->readMulBlank(); break; - case self::XLS_Type_LABEL: + case self::XLS_TYPE_LABEL: $this->readLabel(); break; - case self::XLS_Type_BLANK: + case self::XLS_TYPE_BLANK: $this->readBlank(); break; - case self::XLS_Type_MSODRAWING: + case self::XLS_TYPE_MSODRAWING: $this->readMsoDrawing(); break; - case self::XLS_Type_OBJ: + case self::XLS_TYPE_OBJ: $this->readObj(); break; - case self::XLS_Type_WINDOW2: + case self::XLS_TYPE_WINDOW2: $this->readWindow2(); break; - case self::XLS_Type_PAGELAYOUTVIEW: + case self::XLS_TYPE_PAGELAYOUTVIEW: $this->readPageLayoutView(); break; - case self::XLS_Type_SCL: + case self::XLS_TYPE_SCL: $this->readScl(); break; - case self::XLS_Type_PANE: + case self::XLS_TYPE_PANE: $this->readPane(); break; - case self::XLS_Type_SELECTION: + case self::XLS_TYPE_SELECTION: $this->readSelection(); break; - case self::XLS_Type_MERGEDCELLS: + case self::XLS_TYPE_MERGEDCELLS: $this->readMergedCells(); break; - case self::XLS_Type_HYPERLINK: + case self::XLS_TYPE_HYPERLINK: $this->readHyperLink(); break; - case self::XLS_Type_DATAVALIDATIONS: + case self::XLS_TYPE_DATAVALIDATIONS: $this->readDataValidations(); break; - case self::XLS_Type_DATAVALIDATION: + case self::XLS_TYPE_DATAVALIDATION: $this->readDataValidation(); break; - case self::XLS_Type_SHEETLAYOUT: + case self::XLS_TYPE_SHEETLAYOUT: $this->readSheetLayout(); break; - case self::XLS_Type_SHEETPROTECTION: + case self::XLS_TYPE_SHEETPROTECTION: $this->readSheetProtection(); break; - case self::XLS_Type_RANGEPROTECTION: + case self::XLS_TYPE_RANGEPROTECTION: $this->readRangeProtection(); break; - case self::XLS_Type_NOTE: + case self::XLS_TYPE_NOTE: $this->readNote(); break; - //case self::XLS_Type_IMDATA: $this->readImData(); break; - case self::XLS_Type_TXO: + //case self::XLS_TYPE_IMDATA: $this->readImData(); break; + case self::XLS_TYPE_TXO: $this->readTextObject(); break; - case self::XLS_Type_CONTINUE: + case self::XLS_TYPE_CONTINUE: $this->readContinue(); break; - case self::XLS_Type_EOF: + case self::XLS_TYPE_EOF: $this->readDefault(); break 2; default: @@ -1720,7 +1720,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce do { $code = self::getInt2d($this->data, $this->pos); $this->readDefault(); - } while ($code != self::XLS_Type_EOF && $this->pos < $this->dataSize); + } while ($code != self::XLS_TYPE_EOF && $this->pos < $this->dataSize); break; } } @@ -3905,7 +3905,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // read possible SHAREDFMLA record $code = self::getInt2d($this->data, $this->pos); - if ($code == self::XLS_Type_SHAREDFMLA) { + if ($code == self::XLS_TYPE_SHAREDFMLA) { $this->readSharedFmla(); } @@ -5260,7 +5260,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $this->pos += 4 + $length; $nextIdentifier = self::getInt2d($this->data, $this->pos); - } while ($nextIdentifier == self::XLS_Type_CONTINUE); + } while ($nextIdentifier == self::XLS_TYPE_CONTINUE); $splicedData = array( 'recordData' => $data, diff --git a/Classes/PHPExcel/Reader/Excel5/MD5.php b/Classes/PHPExcel/Reader/Excel5/MD5.php index 1141d43..f14ea94 100644 --- a/Classes/PHPExcel/Reader/Excel5/MD5.php +++ b/Classes/PHPExcel/Reader/Excel5/MD5.php @@ -85,10 +85,10 @@ class PHPExcel_Reader_Excel5_MD5 $C = $this->c; $D = $this->d; - $F = array('PHPExcel_Reader_Excel5_MD5','F'); - $G = array('PHPExcel_Reader_Excel5_MD5','G'); - $H = array('PHPExcel_Reader_Excel5_MD5','H'); - $I = array('PHPExcel_Reader_Excel5_MD5','I'); + $F = array('PHPExcel_Reader_Excel5_MD5','f'); + $G = array('PHPExcel_Reader_Excel5_MD5','g'); + $H = array('PHPExcel_Reader_Excel5_MD5','h'); + $I = array('PHPExcel_Reader_Excel5_MD5','i'); /* ROUND 1 */ self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478); @@ -168,22 +168,22 @@ class PHPExcel_Reader_Excel5_MD5 $this->d = ($this->d + $D) & 0xffffffff; } - private static function F($X, $Y, $Z) + private static function f($X, $Y, $Z) { return (($X & $Y) | ((~ $X) & $Z)); // X AND Y OR NOT X AND Z } - private static function G($X, $Y, $Z) + private static function g($X, $Y, $Z) { return (($X & $Z) | ($Y & (~ $Z))); // X AND Z OR Y AND NOT Z } - private static function H($X, $Y, $Z) + private static function h($X, $Y, $Z) { return ($X ^ $Y ^ $Z); // X XOR Y XOR Z } - private static function I($X, $Y, $Z) + private static function i($X, $Y, $Z) { return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z) } diff --git a/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php index 4b73e07..d68109b 100644 --- a/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php +++ b/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php @@ -73,7 +73,7 @@ class CholeskyDecomposition } } } else { - throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException)); + throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION)); } } // function __construct() @@ -139,10 +139,10 @@ class CholeskyDecomposition throw new PHPExcel_Calculation_Exception(JAMAError(MatrixSPDException)); } } else { - throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionException)); + throw new PHPExcel_Calculation_Exception(JAMAError(MATRIX_DIMENSION_EXCEPTION)); } } else { - throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException)); + throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION)); } } // function solve() } diff --git a/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php b/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php index 64290fe..2505d92 100644 --- a/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php +++ b/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php @@ -20,8 +20,8 @@ */ class PHPExcel_Shared_JAMA_LUDecomposition { - const MatrixSingularException = "Can only perform operation on singular matrix."; - const MatrixSquareException = "Mismatched Row dimension"; + const MATRIX_SINGULAR_EXCEPTION = "Can only perform operation on singular matrix."; + const MATRIX_SQUARE_EXCEPTION = "Mismatched Row dimension"; /** * Decomposition storage @@ -115,7 +115,7 @@ class PHPExcel_Shared_JAMA_LUDecomposition } } } else { - throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ARGUMENT_TYPE_EXCEPTION); } } // function __construct() @@ -208,7 +208,7 @@ class PHPExcel_Shared_JAMA_LUDecomposition } return $d; } else { - throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException); + throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MATRIX_DIMENSION_EXCEPTION); } } // function det() @@ -248,10 +248,10 @@ class PHPExcel_Shared_JAMA_LUDecomposition } return $X; } else { - throw new PHPExcel_Calculation_Exception(self::MatrixSingularException); + throw new PHPExcel_Calculation_Exception(self::MATRIX_SINGULAR_EXCEPTION); } } else { - throw new PHPExcel_Calculation_Exception(self::MatrixSquareException); + throw new PHPExcel_Calculation_Exception(self::MATRIX_SQUARE_EXCEPTION); } - } // function solve() + } } diff --git a/Classes/PHPExcel/Shared/JAMA/Matrix.php b/Classes/PHPExcel/Shared/JAMA/Matrix.php index 83668b0..82fb0fb 100644 --- a/Classes/PHPExcel/Shared/JAMA/Matrix.php +++ b/Classes/PHPExcel/Shared/JAMA/Matrix.php @@ -26,11 +26,11 @@ if (!defined('PHPEXCEL_ROOT')) { */ class PHPExcel_Shared_JAMA_Matrix { - const PolymorphicArgumentException = "Invalid argument pattern for polymorphic function."; - const ArgumentTypeException = "Invalid argument type."; - const ArgumentBoundsException = "Invalid argument range."; - const MatrixDimensionException = "Matrix dimensions are not equal."; - const ArrayLengthException = "Array length must be a multiple of m."; + const POLYMORPHIC_ARGUMENT_EXCEPTION = "Invalid argument pattern for polymorphic function."; + const ARGUMENT_TYPE_EXCEPTION = "Invalid argument type."; + const ARGUMENT_BOUNDS_EXCEPTION = "Invalid argument range."; + const MATRIX_DIMENSION_EXCEPTION = "Matrix dimensions are not equal."; + const ARRAY_LENGTH_EXCEPTION = "Array length must be a multiple of m."; /** * Matrix storage @@ -101,15 +101,15 @@ class PHPExcel_Shared_JAMA_Matrix } } } else { - throw new PHPExcel_Calculation_Exception(self::ArrayLengthException); + throw new PHPExcel_Calculation_Exception(self::ARRAY_LENGTH_EXCEPTION); } break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -179,12 +179,12 @@ class PHPExcel_Shared_JAMA_Matrix if ($i0 >= 0) { $m = $this->m - $i0; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } if ($j0 >= 0) { $n = $this->n - $j0; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } $R = new PHPExcel_Shared_JAMA_Matrix($m, $n); for ($i = $i0; $i < $this->m; ++$i) { @@ -200,12 +200,12 @@ class PHPExcel_Shared_JAMA_Matrix if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } $R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1); for ($i = $i0; $i <= $iF; ++$i) { @@ -221,12 +221,12 @@ class PHPExcel_Shared_JAMA_Matrix if (count($RL) > 0) { $m = count($RL); } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } if (count($CL) > 0) { $n = count($CL); } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } $R = new PHPExcel_Shared_JAMA_Matrix($m, $n); for ($i = 0; $i < $m; ++$i) { @@ -242,12 +242,12 @@ class PHPExcel_Shared_JAMA_Matrix if (count($RL) > 0) { $m = count($RL); } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } if (count($CL) > 0) { $n = count($CL); } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } $R = new PHPExcel_Shared_JAMA_Matrix($m, $n); for ($i = 0; $i < $m; ++$i) { @@ -263,12 +263,12 @@ class PHPExcel_Shared_JAMA_Matrix if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } if (count($CL) > 0) { $n = count($CL); } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } $R = new PHPExcel_Shared_JAMA_Matrix($m, $n); for ($i = $i0; $i < $iF; ++$i) { @@ -284,12 +284,12 @@ class PHPExcel_Shared_JAMA_Matrix if (count($RL) > 0) { $m = count($RL); } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_BOUNDS_EXCEPTION); } $R = new PHPExcel_Shared_JAMA_Matrix($m, $n+1); for ($i = 0; $i < $m; ++$i) { @@ -300,11 +300,11 @@ class PHPExcel_Shared_JAMA_Matrix return $R; break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -321,10 +321,10 @@ class PHPExcel_Shared_JAMA_Matrix if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) { return true; } else { - throw new PHPExcel_Calculation_Exception(self::MatrixDimensionException); + throw new PHPExcel_Calculation_Exception(self::MATRIX_DIMENSION_EXCEPTION); } } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } } // function checkMatrixDimensions() @@ -391,7 +391,7 @@ class PHPExcel_Shared_JAMA_Matrix return $this->getMatrix($i0, 0, $i0 + 1, $this->n); } } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } } @@ -412,7 +412,7 @@ class PHPExcel_Shared_JAMA_Matrix return $this->getMatrix(0, $j0, $this->m, $j0 + 1); } } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } } @@ -477,14 +477,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -495,7 +495,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -517,14 +517,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -549,7 +549,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $this; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -571,14 +571,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -589,7 +589,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -611,14 +611,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -643,7 +643,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $this; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -666,14 +666,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -684,7 +684,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -707,14 +707,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -739,7 +739,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $this; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -762,14 +762,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -799,7 +799,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -823,14 +823,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -841,7 +841,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -865,14 +865,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -883,7 +883,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -907,14 +907,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -925,7 +925,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $M; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -948,7 +948,7 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $B = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } if ($this->n == $B->m) { $C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n); @@ -1017,11 +1017,11 @@ class PHPExcel_Shared_JAMA_Matrix return $C; break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -1043,14 +1043,14 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } break; case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -1075,7 +1075,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $this; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } @@ -1097,13 +1097,13 @@ class PHPExcel_Shared_JAMA_Matrix if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { - throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(self::ARGUMENT_TYPE_EXCEPTION); } case 'array': $M = new PHPExcel_Shared_JAMA_Matrix($args[0]); break; default: - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); break; } $this->checkMatrixDimensions($M); @@ -1114,7 +1114,7 @@ class PHPExcel_Shared_JAMA_Matrix } return $this; } else { - throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException); + throw new PHPExcel_Calculation_Exception(self::POLYMORPHIC_ARGUMENT_EXCEPTION); } } diff --git a/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php b/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php index b20e5a0..1e43c7c 100644 --- a/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php +++ b/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php @@ -18,7 +18,7 @@ */ class PHPExcel_Shared_JAMA_QRDecomposition { - const MatrixRankException = "Can only perform operation on full-rank matrix."; + const MATRIX_RANK_EXCEPTION = "Can only perform operation on full-rank matrix."; /** * Array for internal storage of decomposition. @@ -89,7 +89,7 @@ class PHPExcel_Shared_JAMA_QRDecomposition $this->Rdiag[$k] = -$nrm; } } else { - throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException); + throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ARGUMENT_TYPE_EXCEPTION); } } // function __construct() @@ -226,10 +226,10 @@ class PHPExcel_Shared_JAMA_QRDecomposition $X = new PHPExcel_Shared_JAMA_Matrix($X); return ($X->getMatrix(0, $this->n-1, 0, $nx)); } else { - throw new PHPExcel_Calculation_Exception(self::MatrixRankException); + throw new PHPExcel_Calculation_Exception(self::MATRIX_RANK_EXCEPTION); } } else { - throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException); + throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MATRIX_DIMENSION_EXCEPTION); } - } // function solve() + } } diff --git a/Classes/PHPExcel/Shared/JAMA/utils/Error.php b/Classes/PHPExcel/Shared/JAMA/utils/Error.php index 155bcba..71b8c99 100644 --- a/Classes/PHPExcel/Shared/JAMA/utils/Error.php +++ b/Classes/PHPExcel/Shared/JAMA/utils/Error.php @@ -21,47 +21,47 @@ I've used Babelfish and a little poor knowledge of Romance/Germanic languages fo Feel free to correct anything that looks amiss to you. */ -define('PolymorphicArgumentException', -1); -$error['EN'][PolymorphicArgumentException] = "Invalid argument pattern for polymorphic function."; -$error['FR'][PolymorphicArgumentException] = "Modèle inadmissible d'argument pour la fonction polymorphe.". -$error['DE'][PolymorphicArgumentException] = "Unzulässiges Argumentmuster für polymorphe Funktion."; +define('POLYMORPHIC_ARGUMENT_EXCEPTION', -1); +$error['EN'][POLYMORPHIC_ARGUMENT_EXCEPTION] = "Invalid argument pattern for polymorphic function."; +$error['FR'][POLYMORPHIC_ARGUMENT_EXCEPTION] = "Modèle inadmissible d'argument pour la fonction polymorphe.". +$error['DE'][POLYMORPHIC_ARGUMENT_EXCEPTION] = "Unzulässiges Argumentmuster für polymorphe Funktion."; -define('ArgumentTypeException', -2); -$error['EN'][ArgumentTypeException] = "Invalid argument type."; -$error['FR'][ArgumentTypeException] = "Type inadmissible d'argument."; -$error['DE'][ArgumentTypeException] = "Unzulässige Argumentart."; +define('ARGUMENT_TYPE_EXCEPTION', -2); +$error['EN'][ARGUMENT_TYPE_EXCEPTION] = "Invalid argument type."; +$error['FR'][ARGUMENT_TYPE_EXCEPTION] = "Type inadmissible d'argument."; +$error['DE'][ARGUMENT_TYPE_EXCEPTION] = "Unzulässige Argumentart."; -define('ArgumentBoundsException', -3); -$error['EN'][ArgumentBoundsException] = "Invalid argument range."; -$error['FR'][ArgumentBoundsException] = "Gamme inadmissible d'argument."; -$error['DE'][ArgumentBoundsException] = "Unzulässige Argumentstrecke."; +define('ARGUMENT_BOUNDS_EXCEPTION', -3); +$error['EN'][ARGUMENT_BOUNDS_EXCEPTION] = "Invalid argument range."; +$error['FR'][ARGUMENT_BOUNDS_EXCEPTION] = "Gamme inadmissible d'argument."; +$error['DE'][ARGUMENT_BOUNDS_EXCEPTION] = "Unzulässige Argumentstrecke."; -define('MatrixDimensionException', -4); -$error['EN'][MatrixDimensionException] = "Matrix dimensions are not equal."; -$error['FR'][MatrixDimensionException] = "Les dimensions de Matrix ne sont pas égales."; -$error['DE'][MatrixDimensionException] = "Matrixmaße sind nicht gleich."; +define('MATRIX_DIMENSION_EXCEPTION', -4); +$error['EN'][MATRIX_DIMENSION_EXCEPTION] = "Matrix dimensions are not equal."; +$error['FR'][MATRIX_DIMENSION_EXCEPTION] = "Les dimensions de Matrix ne sont pas égales."; +$error['DE'][MATRIX_DIMENSION_EXCEPTION] = "Matrixmaße sind nicht gleich."; -define('PrecisionLossException', -5); -$error['EN'][PrecisionLossException] = "Significant precision loss detected."; -$error['FR'][PrecisionLossException] = "Perte significative de précision détectée."; -$error['DE'][PrecisionLossException] = "Bedeutender Präzision Verlust ermittelte."; +define('PRECISION_LOSS_EXCEPTION', -5); +$error['EN'][PRECISION_LOSS_EXCEPTION] = "Significant precision loss detected."; +$error['FR'][PRECISION_LOSS_EXCEPTION] = "Perte significative de précision détectée."; +$error['DE'][PRECISION_LOSS_EXCEPTION] = "Bedeutender Präzision Verlust ermittelte."; -define('MatrixSPDException', -6); -$error['EN'][MatrixSPDException] = "Can only perform operation on symmetric positive definite matrix."; -$error['FR'][MatrixSPDException] = "Perte significative de précision détectée."; -$error['DE'][MatrixSPDException] = "Bedeutender Präzision Verlust ermittelte."; +define('MATRIX_SPD_EXCEPTION', -6); +$error['EN'][MATRIX_SPD_EXCEPTION] = "Can only perform operation on symmetric positive definite matrix."; +$error['FR'][MATRIX_SPD_EXCEPTION] = "Perte significative de précision détectée."; +$error['DE'][MATRIX_SPD_EXCEPTION] = "Bedeutender Präzision Verlust ermittelte."; -define('MatrixSingularException', -7); -$error['EN'][MatrixSingularException] = "Can only perform operation on singular matrix."; +define('MATRIX_SINGULAR_EXCEPTION', -7); +$error['EN'][MATRIX_SINGULAR_EXCEPTION] = "Can only perform operation on singular matrix."; -define('MatrixRankException', -8); -$error['EN'][MatrixRankException] = "Can only perform operation on full-rank matrix."; +define('MATRIX_RANK_EXCEPTION', -8); +$error['EN'][MATRIX_RANK_EXCEPTION] = "Can only perform operation on full-rank matrix."; -define('ArrayLengthException', -9); -$error['EN'][ArrayLengthException] = "Array length must be a multiple of m."; +define('ARRAY_LENGTH_EXCEPTION', -9); +$error['EN'][ARRAY_LENGTH_EXCEPTION] = "Array length must be a multiple of m."; -define('RowLengthException', -10); -$error['EN'][RowLengthException] = "All rows must have the same length."; +define('ROW_LENGTH_EXCEPTION', -10); +$error['EN'][ROW_LENGTH_EXCEPTION] = "All rows must have the same length."; /** * Custom error handler diff --git a/Classes/PHPExcel/Shared/JAMA/utils/Maths.php b/Classes/PHPExcel/Shared/JAMA/utils/Maths.php index 6d4db65..386c1e6 100644 --- a/Classes/PHPExcel/Shared/JAMA/utils/Maths.php +++ b/Classes/PHPExcel/Shared/JAMA/utils/Maths.php @@ -36,7 +36,7 @@ function hypot() { if (is_numeric($d)) { $s += pow($d, 2); } else { - throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException)); + throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION)); } } return sqrt($s);