Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-06 12:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-03-16 13:22:28 +01:00
parent 9f5f45fa7c
commit 6781777cd4
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Math/Matrix/Matrix.php
View File

@ -212,43 +212,24 @@ class Matrix implements ArrayAccess, Iterator
} }
} }
// todo: maybe replace by triangulize/vice versa????!!!?!?! $mDim = count($newMatrixArr);
$nDim = count($newMatrixArr[0])
// pivoting // pivoting
for($i = $this->n - 1; $i > 0; $i--) { $newMatrixArr = $this->diag($newMatrixArr);
if ($newMatrixArr[$i - 1][0] < $newMatrixArr[$i][0]) {
for($j = 0; $j < $this->n * 2; $j++) {
$temp = $newMatrixArr[$i][$j];
$newMatrixArr[$i][$j] = $newMatrixArr[$i-1][$j];
$newMatrixArr[$i-1][$j] = $temp;
}
}
}
/* create diagonal matrix */
for($i = 0; $i < $this->n; $i++) {
for($j = 0; $j < $this->n; $j++) {
if ($j !== $i) {
$temp = $newMatrixArr[$j][$i] / $newMatrixArr[$i][$i];
for($c = 0; $c < $this->n * 2; $c++) {
$newMatrixArr[$j][$c] -= $newMatrixArr[$i][$c] * $temp;
}
}
}
}
/* create unit matrix */ /* create unit matrix */
for($i = 0; $i < $this->n; $i++) { for($i = 0; $i < $mDim; $i++) {
$temp = $newMatrixArr[$i][$i]; $temp = $newMatrixArr[$i][$i];
for($j = 0; $j < $this->n * 2; $j++) { for($j = 0; $j < $nDim; $j++) {
$newMatrixArr[$i][$j] = $newMatrixArr[$i][$j] / $temp; $newMatrixArr[$i][$j] = $newMatrixArr[$i][$j] / $temp;
} }
} }
/* removing identity matrix */ /* removing identity matrix */
for($i = 0; $i < $this->n; $i++) { for($i = 0; $i < $mDim; $i++) {
$newMatrixArr[$i] = array_slice($newMatrixArr[$i], $this->n); $newMatrixArr[$i] = array_slice($newMatrixArr[$i], $mDim);
} }
$newMatrix = new Matrix($this->n, $this->n); $newMatrix = new Matrix($this->n, $this->n);
@ -279,6 +260,37 @@ class Matrix implements ArrayAccess, Iterator
return $newMatrix; return $newMatrix;
} }
private function diag(array $arr) : array
{
$mDim = count($arr);
$nDim = count($arr[0]);
for($i = $mDim - 1; $i > 0; $i--) {
if ($arr[$i - 1][0] < $arr[$i][0]) {
for($j = 0; $j < $nDim; $j++) {
$temp = $arr[$i][$j];
$arr[$i][$j] = $arr[$i-1][$j];
$arr[$i-1][$j] = $temp;
}
}
}
/* create diagonal matrix */
for($i = 0; $i < $mDim; $i++) {
for($j = 0; $j < $mDim; $j++) {
if ($j !== $i) {
$temp = $arr[$j][$i] / $arr[$i][$i];
for($c = 0; $c < $nDim; $c++) {
$arr[$j][$c] -= $arr[$i][$c] * $temp;
}
}
}
}
return $arr;
}
private function upperTrianglize(array &$arr) : int private function upperTrianglize(array &$arr) : int
{ {
$n = count($arr); $n = count($arr);
@ -296,7 +308,8 @@ class Matrix implements ArrayAccess, Iterator
if ($max) { if ($max) {
$sign = -$sign; $sign = -$sign;
$temp = $arr[$i]; $temp = $arr[$i];
$arr[$i] = $arr[$max], $arr[$max] = $temp; $arr[$i] = $arr[$max];
$arr[$max] = $temp;
} }
if (!$arr[$i][$i]) { if (!$arr[$i][$i]) {