@@ -31,17 +31,17 @@ |
||
31 | 31 | |
32 | 32 | // Add some data |
33 | 33 | $database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'], |
34 | - ['Apple', 18, 20, 14, 105.00], |
|
35 | - ['Pear', 12, 12, 10, 96.00], |
|
36 | - ['Cherry', 13, 14, 9, 105.00], |
|
37 | - ['Apple', 14, 15, 10, 75.00], |
|
38 | - ['Pear', 9, 8, 8, 76.80], |
|
39 | - ['Apple', 8, 9, 6, 45.00], |
|
40 | - ]; |
|
34 | + ['Apple', 18, 20, 14, 105.00], |
|
35 | + ['Pear', 12, 12, 10, 96.00], |
|
36 | + ['Cherry', 13, 14, 9, 105.00], |
|
37 | + ['Apple', 14, 15, 10, 75.00], |
|
38 | + ['Pear', 9, 8, 8, 76.80], |
|
39 | + ['Apple', 8, 9, 6, 45.00], |
|
40 | + ]; |
|
41 | 41 | $criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'], |
42 | - ['="=Apple"', '>10', null, null, null, '<16'], |
|
43 | - ['="=Pear"', null, null, null, null, null], |
|
44 | - ]; |
|
42 | + ['="=Apple"', '>10', null, null, null, '<16'], |
|
43 | + ['="=Pear"', null, null, null, null, null], |
|
44 | + ]; |
|
45 | 45 | |
46 | 46 | $worksheet->fromArray($criteria, null, 'A1'); |
47 | 47 | $worksheet->fromArray($database, null, 'A4'); |
@@ -30,17 +30,17 @@ |
||
30 | 30 | $worksheet = $objPHPExcel->getActiveSheet(); |
31 | 31 | |
32 | 32 | // Add some data |
33 | -$database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'], |
|
34 | - ['Apple', 18, 20, 14, 105.00], |
|
35 | - ['Pear', 12, 12, 10, 96.00], |
|
36 | - ['Cherry', 13, 14, 9, 105.00], |
|
37 | - ['Apple', 14, 15, 10, 75.00], |
|
38 | - ['Pear', 9, 8, 8, 76.80], |
|
39 | - ['Apple', 8, 9, 6, 45.00], |
|
33 | +$database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'], |
|
34 | + ['Apple', 18, 20, 14, 105.00], |
|
35 | + ['Pear', 12, 12, 10, 96.00], |
|
36 | + ['Cherry', 13, 14, 9, 105.00], |
|
37 | + ['Apple', 14, 15, 10, 75.00], |
|
38 | + ['Pear', 9, 8, 8, 76.80], |
|
39 | + ['Apple', 8, 9, 6, 45.00], |
|
40 | 40 | ]; |
41 | -$criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'], |
|
42 | - ['="=Apple"', '>10', null, null, null, '<16'], |
|
43 | - ['="=Pear"', null, null, null, null, null], |
|
41 | +$criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'], |
|
42 | + ['="=Apple"', '>10', null, null, null, '<16'], |
|
43 | + ['="=Pear"', null, null, null, null, null], |
|
44 | 44 | ]; |
45 | 45 | |
46 | 46 | $worksheet->fromArray($criteria, null, 'A1'); |
@@ -33,18 +33,18 @@ |
||
33 | 33 | $inputFileName = './sampleData/example1.xls'; |
34 | 34 | $sheetnames = ['Data Sheet #1', 'Data Sheet #3']; |
35 | 35 | |
36 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
36 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
37 | 37 | $objReader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType); |
38 | -echo 'Loading Sheet',((count($sheetnames) == 1) ? '' : 's'),' "',implode('" and "', $sheetnames),'" only<br />'; |
|
38 | +echo 'Loading Sheet', ((count($sheetnames) == 1) ? '' : 's'), ' "', implode('" and "', $sheetnames), '" only<br />'; |
|
39 | 39 | $objReader->setLoadSheetsOnly($sheetnames); |
40 | 40 | $spreadsheet = $objReader->load($inputFileName); |
41 | 41 | |
42 | 42 | echo '<hr />'; |
43 | 43 | |
44 | -echo $spreadsheet->getSheetCount(),' worksheet',(($spreadsheet->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />'; |
|
44 | +echo $spreadsheet->getSheetCount(), ' worksheet', (($spreadsheet->getSheetCount() == 1) ? '' : 's'), ' loaded<br /><br />'; |
|
45 | 45 | $loadedSheetNames = $spreadsheet->getSheetNames(); |
46 | 46 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
47 | - echo $sheetIndex,' -> ',$loadedSheetName,'<br />'; |
|
47 | + echo $sheetIndex, ' -> ', $loadedSheetName, '<br />'; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | ?> |
@@ -33,18 +33,18 @@ |
||
33 | 33 | $inputFileName = './sampleData/example1.xls'; |
34 | 34 | $sheetname = 'Data Sheet #2'; |
35 | 35 | |
36 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
36 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
37 | 37 | $objReader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType); |
38 | -echo 'Loading Sheet "',$sheetname,'" only<br />'; |
|
38 | +echo 'Loading Sheet "', $sheetname, '" only<br />'; |
|
39 | 39 | $objReader->setLoadSheetsOnly($sheetname); |
40 | 40 | $spreadsheet = $objReader->load($inputFileName); |
41 | 41 | |
42 | 42 | echo '<hr />'; |
43 | 43 | |
44 | -echo $spreadsheet->getSheetCount(),' worksheet',(($spreadsheet->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />'; |
|
44 | +echo $spreadsheet->getSheetCount(), ' worksheet', (($spreadsheet->getSheetCount() == 1) ? '' : 's'), ' loaded<br /><br />'; |
|
45 | 45 | $loadedSheetNames = $spreadsheet->getSheetNames(); |
46 | 46 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
47 | - echo $sheetIndex,' -> ',$loadedSheetName,'<br />'; |
|
47 | + echo $sheetIndex, ' -> ', $loadedSheetName, '<br />'; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | ?> |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | // $inputFileType = 'Gnumeric'; |
33 | 33 | $inputFileName = './sampleData/example1.xls'; |
34 | 34 | |
35 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
35 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
36 | 36 | $objReader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType); |
37 | 37 | echo 'Loading all WorkSheets<br />'; |
38 | 38 | $objReader->setLoadAllSheets(); |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | |
41 | 41 | echo '<hr />'; |
42 | 42 | |
43 | -echo $spreadsheet->getSheetCount(),' worksheet',(($spreadsheet->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />'; |
|
43 | +echo $spreadsheet->getSheetCount(), ' worksheet', (($spreadsheet->getSheetCount() == 1) ? '' : 's'), ' loaded<br /><br />'; |
|
44 | 44 | $loadedSheetNames = $spreadsheet->getSheetNames(); |
45 | 45 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
46 | - echo $sheetIndex,' -> ',$loadedSheetName,'<br />'; |
|
46 | + echo $sheetIndex, ' -> ', $loadedSheetName, '<br />'; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | ?> |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | $inputFileName = './sampleData/example1.xls'; |
29 | 29 | |
30 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' using \PhpOffice\PhpSpreadsheet\Reader\Xls<br />'; |
|
30 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using \PhpOffice\PhpSpreadsheet\Reader\Xls<br />'; |
|
31 | 31 | $objReader = new \PhpOffice\PhpSpreadsheet\Reader\Xls(); |
32 | 32 | // $objReader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx(); |
33 | 33 | // $objReader = new \PhpOffice\PhpSpreadsheet\Reader\Excel2003XML(); |
@@ -26,17 +26,17 @@ discard block |
||
26 | 26 | $inputFileName = './sampleData/example1.tsv'; |
27 | 27 | |
28 | 28 | $objReader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType); |
29 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' into WorkSheet #1 using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
29 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' into WorkSheet #1 using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
30 | 30 | $objReader->setDelimiter("\t"); |
31 | 31 | $spreadsheet = $objReader->load($inputFileName); |
32 | 32 | $spreadsheet->getActiveSheet()->setTitle(pathinfo($inputFileName, PATHINFO_BASENAME)); |
33 | 33 | |
34 | 34 | echo '<hr />'; |
35 | 35 | |
36 | -echo $spreadsheet->getSheetCount(),' worksheet',(($spreadsheet->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />'; |
|
36 | +echo $spreadsheet->getSheetCount(), ' worksheet', (($spreadsheet->getSheetCount() == 1) ? '' : 's'), ' loaded<br /><br />'; |
|
37 | 37 | $loadedSheetNames = $spreadsheet->getSheetNames(); |
38 | 38 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
39 | - echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,' (Formatted)</b><br />'; |
|
39 | + echo '<b>Worksheet #', $sheetIndex, ' -> ', $loadedSheetName, ' (Formatted)</b><br />'; |
|
40 | 40 | $spreadsheet->setActiveSheetIndexByName($loadedSheetName); |
41 | 41 | $sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true); |
42 | 42 | var_dump($sheetData); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | echo '<hr />'; |
47 | 47 | |
48 | 48 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
49 | - echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,' (Unformatted)</b><br />'; |
|
49 | + echo '<b>Worksheet #', $sheetIndex, ' -> ', $loadedSheetName, ' (Unformatted)</b><br />'; |
|
50 | 50 | $spreadsheet->setActiveSheetIndexByName($loadedSheetName); |
51 | 51 | $sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, false, true); |
52 | 52 | var_dump($sheetData); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | echo '<hr />'; |
57 | 57 | |
58 | 58 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
59 | - echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,' (Raw)</b><br />'; |
|
59 | + echo '<b>Worksheet #', $sheetIndex, ' -> ', $loadedSheetName, ' (Raw)</b><br />'; |
|
60 | 60 | $spreadsheet->setActiveSheetIndexByName($loadedSheetName); |
61 | 61 | $sheetData = $spreadsheet->getActiveSheet()->toArray(null, false, false, true); |
62 | 62 | var_dump($sheetData); |
@@ -32,7 +32,7 @@ |
||
32 | 32 | // $inputFileType = 'Gnumeric'; |
33 | 33 | $inputFileName = './sampleData/example1.xls'; |
34 | 34 | |
35 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' information using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
35 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' information using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
36 | 36 | |
37 | 37 | $objReader = PHPExcel_IOFactory::createReader($inputFileType); |
38 | 38 | $worksheetData = $objReader->listWorksheetInfo($inputFileName); |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | |
31 | 31 | $objReader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType); |
32 | 32 | $inputFileName = array_shift($inputFileNames); |
33 | -echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' into WorkSheet #1 using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
33 | +echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' into WorkSheet #1 using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
34 | 34 | $spreadsheet = $objReader->load($inputFileName); |
35 | 35 | $spreadsheet->getActiveSheet()->setTitle(pathinfo($inputFileName, PATHINFO_BASENAME)); |
36 | 36 | foreach ($inputFileNames as $sheet => $inputFileName) { |
37 | - echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' into WorkSheet #',($sheet + 2),' using IOFactory with a defined reader type of ',$inputFileType,'<br />'; |
|
37 | + echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' into WorkSheet #', ($sheet + 2), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />'; |
|
38 | 38 | $objReader->setSheetIndex($sheet + 1); |
39 | 39 | $objReader->loadIntoExisting($inputFileName, $spreadsheet); |
40 | 40 | $spreadsheet->getActiveSheet()->setTitle(pathinfo($inputFileName, PATHINFO_BASENAME)); |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | |
43 | 43 | echo '<hr />'; |
44 | 44 | |
45 | -echo $spreadsheet->getSheetCount(),' worksheet',(($spreadsheet->getSheetCount() == 1) ? '' : 's'),' loaded<br /><br />'; |
|
45 | +echo $spreadsheet->getSheetCount(), ' worksheet', (($spreadsheet->getSheetCount() == 1) ? '' : 's'), ' loaded<br /><br />'; |
|
46 | 46 | $loadedSheetNames = $spreadsheet->getSheetNames(); |
47 | 47 | foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) { |
48 | - echo '<b>Worksheet #',$sheetIndex,' -> ',$loadedSheetName,'</b><br />'; |
|
48 | + echo '<b>Worksheet #', $sheetIndex, ' -> ', $loadedSheetName, '</b><br />'; |
|
49 | 49 | $spreadsheet->setActiveSheetIndexByName($loadedSheetName); |
50 | 50 | $sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true); |
51 | 51 | var_dump($sheetData); |
@@ -149,12 +149,6 @@ discard block |
||
149 | 149 | * |
150 | 150 | * Get a submatrix |
151 | 151 | * |
152 | - * @param int $i0 Initial row index |
|
153 | - * @param int $iF Final row index |
|
154 | - * @param int $j0 Initial column index |
|
155 | - * @param int $jF Final column index |
|
156 | - * |
|
157 | - * @return Matrix Submatrix |
|
158 | 152 | */ |
159 | 153 | public function getMatrix() |
160 | 154 | { |
@@ -365,7 +359,7 @@ discard block |
||
365 | 359 | * |
366 | 360 | * @param int $m Row dimension |
367 | 361 | * @param int $n Column dimension |
368 | - * @param mixed $c Diagonal value |
|
362 | + * @param integer $c Diagonal value |
|
369 | 363 | * |
370 | 364 | * @return Matrix Diagonal matrix |
371 | 365 | */ |
@@ -449,7 +443,7 @@ discard block |
||
449 | 443 | * |
450 | 444 | * Sum of diagonal elements |
451 | 445 | * |
452 | - * @return float Sum of diagonal elements |
|
446 | + * @return integer Sum of diagonal elements |
|
453 | 447 | */ |
454 | 448 | public function trace() |
455 | 449 | { |
@@ -478,9 +472,6 @@ discard block |
||
478 | 472 | * |
479 | 473 | * A + B |
480 | 474 | * |
481 | - * @param mixed $B Matrix/Array |
|
482 | - * |
|
483 | - * @return Matrix Sum |
|
484 | 475 | */ |
485 | 476 | public function plus() |
486 | 477 | { |
@@ -521,9 +512,6 @@ discard block |
||
521 | 512 | * |
522 | 513 | * A = A + B |
523 | 514 | * |
524 | - * @param mixed $B Matrix/Array |
|
525 | - * |
|
526 | - * @return Matrix Sum |
|
527 | 515 | */ |
528 | 516 | public function plusEquals() |
529 | 517 | { |
@@ -578,9 +566,6 @@ discard block |
||
578 | 566 | * |
579 | 567 | * A - B |
580 | 568 | * |
581 | - * @param mixed $B Matrix/Array |
|
582 | - * |
|
583 | - * @return Matrix Sum |
|
584 | 569 | */ |
585 | 570 | public function minus() |
586 | 571 | { |
@@ -621,9 +606,6 @@ discard block |
||
621 | 606 | * |
622 | 607 | * A = A - B |
623 | 608 | * |
624 | - * @param mixed $B Matrix/Array |
|
625 | - * |
|
626 | - * @return Matrix Sum |
|
627 | 609 | */ |
628 | 610 | public function minusEquals() |
629 | 611 | { |
@@ -679,9 +661,6 @@ discard block |
||
679 | 661 | * Element-by-element multiplication |
680 | 662 | * Cij = Aij * Bij |
681 | 663 | * |
682 | - * @param mixed $B Matrix/Array |
|
683 | - * |
|
684 | - * @return Matrix Matrix Cij |
|
685 | 664 | */ |
686 | 665 | public function arrayTimes() |
687 | 666 | { |
@@ -723,9 +702,6 @@ discard block |
||
723 | 702 | * Element-by-element multiplication |
724 | 703 | * Aij = Aij * Bij |
725 | 704 | * |
726 | - * @param mixed $B Matrix/Array |
|
727 | - * |
|
728 | - * @return Matrix Matrix Aij |
|
729 | 705 | */ |
730 | 706 | public function arrayTimesEquals() |
731 | 707 | { |
@@ -781,9 +757,6 @@ discard block |
||
781 | 757 | * Element-by-element right division |
782 | 758 | * A / B |
783 | 759 | * |
784 | - * @param Matrix $B Matrix B |
|
785 | - * |
|
786 | - * @return Matrix Division result |
|
787 | 760 | */ |
788 | 761 | public function arrayRightDivide() |
789 | 762 | { |
@@ -844,9 +817,6 @@ discard block |
||
844 | 817 | * Element-by-element right division |
845 | 818 | * Aij = Aij / Bij |
846 | 819 | * |
847 | - * @param mixed $B Matrix/Array |
|
848 | - * |
|
849 | - * @return Matrix Matrix Aij |
|
850 | 820 | */ |
851 | 821 | public function arrayRightDivideEquals() |
852 | 822 | { |
@@ -888,9 +858,6 @@ discard block |
||
888 | 858 | * Element-by-element Left division |
889 | 859 | * A / B |
890 | 860 | * |
891 | - * @param Matrix $B Matrix B |
|
892 | - * |
|
893 | - * @return Matrix Division result |
|
894 | 861 | */ |
895 | 862 | public function arrayLeftDivide() |
896 | 863 | { |
@@ -932,9 +899,6 @@ discard block |
||
932 | 899 | * Element-by-element Left division |
933 | 900 | * Aij = Aij / Bij |
934 | 901 | * |
935 | - * @param mixed $B Matrix/Array |
|
936 | - * |
|
937 | - * @return Matrix Matrix Aij |
|
938 | 902 | */ |
939 | 903 | public function arrayLeftDivideEquals() |
940 | 904 | { |
@@ -975,9 +939,6 @@ discard block |
||
975 | 939 | * |
976 | 940 | * Matrix multiplication |
977 | 941 | * |
978 | - * @param mixed $n Matrix/Array/Scalar |
|
979 | - * |
|
980 | - * @return Matrix Product |
|
981 | 942 | */ |
982 | 943 | public function times() |
983 | 944 | { |
@@ -1078,9 +1039,6 @@ discard block |
||
1078 | 1039 | * |
1079 | 1040 | * A = A ^ B |
1080 | 1041 | * |
1081 | - * @param mixed $B Matrix/Array |
|
1082 | - * |
|
1083 | - * @return Matrix Sum |
|
1084 | 1042 | */ |
1085 | 1043 | public function power() |
1086 | 1044 | { |
@@ -1135,9 +1093,6 @@ discard block |
||
1135 | 1093 | * |
1136 | 1094 | * A = A & B |
1137 | 1095 | * |
1138 | - * @param mixed $B Matrix/Array |
|
1139 | - * |
|
1140 | - * @return Matrix Sum |
|
1141 | 1096 | */ |
1142 | 1097 | public function concat() |
1143 | 1098 | { |