support php8019 and some cleanup (by @D-aHTuCT)

This commit is contained in:
kotyara 2022-07-26 16:06:34 +05:00
parent cf0f9df267
commit b60f0877e1
376 changed files with 6528 additions and 13472 deletions

View file

@ -1,87 +1,42 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
class Matrix implements ArrayAccess{
private $matrix = array();
private $matrix = [];
private $rows = 0;
private $columns = 0;
public function offsetExists($offset){
return isset($this->matrix[(int) $offset]);
}
public function offsetGet($offset){
return $this->matrix[(int) $offset];
}
public function offsetSet($offset, $value){
$this->matrix[(int) $offset] = $value;
}
public function offsetUnset($offset){
unset($this->matrix[(int) $offset]);
}
public function __construct($rows, $columns, array $set = array()){
public function __construct($rows, $columns, array $set = []){
$this->rows = max(1, (int) $rows);
$this->columns = max(1, (int) $columns);
$this->set($set);
}
public function set(array $m){
for($r = 0; $r < $this->rows; ++$r){
$this->matrix[$r] = array();
$this->matrix[$r] = [];
for($c = 0; $c < $this->columns; ++$c){
$this->matrix[$r][$c] = isset($m[$r][$c]) ? $m[$r][$c] : 0;
}
}
}
public function getRows(){
return ($this->rows);
public function offsetExists($offset){
return isset($this->matrix[(int) $offset]);
}
public function getColumns(){
return ($this->columns);
public function offsetGet($offset){
return $this->matrix[(int) $offset];
}
public function setElement($row, $column, $value){
if($row > $this->rows or $row < 0 or $column > $this->columns or $column < 0){
return false;
}
$this->matrix[(int) $row][(int) $column] = $value;
return true;
public function offsetSet($offset, $value){
$this->matrix[(int) $offset] = $value;
}
public function getElement($row, $column){
if($row > $this->rows or $row < 0 or $column > $this->columns or $column < 0){
return false;
}
return $this->matrix[(int) $row][(int) $column];
public function offsetUnset($offset){
unset($this->matrix[(int) $offset]);
}
public function isSquare(){
return $this->rows === $this->columns;
}
public function add(Matrix $matrix){
if($this->rows !== $matrix->getRows() or $this->columns !== $matrix->getColumns()){
return false;
@ -94,7 +49,30 @@ class Matrix implements ArrayAccess{
}
return $result;
}
public function getRows(){
return ($this->rows);
}
public function getColumns(){
return ($this->columns);
}
public function setElement($row, $column, $value){
if($row > $this->rows or $row < 0 or $column > $this->columns or $column < 0){
return false;
}
$this->matrix[(int) $row][(int) $column] = $value;
return true;
}
public function getElement($row, $column){
if($row > $this->rows or $row < 0 or $column > $this->columns or $column < 0){
return false;
}
return $this->matrix[(int) $row][(int) $column];
}
public function substract(Matrix $matrix){
if($this->rows !== $matrix->getRows() or $this->columns !== $matrix->getColumns()){
return false;
@ -107,7 +85,7 @@ class Matrix implements ArrayAccess{
}
return $result;
}
public function multiplyScalar($number){
$result = clone $this;
for($r = 0; $r < $this->rows; ++$r){
@ -117,8 +95,7 @@ class Matrix implements ArrayAccess{
}
return $result;
}
public function divideScalar($number){
$result = clone $this;
for($r = 0; $r < $this->rows; ++$r){
@ -128,7 +105,7 @@ class Matrix implements ArrayAccess{
}
return $result;
}
public function transpose(){
$result = new Matrix($this->columns, $this->rows);
for($r = 0; $r < $this->rows; ++$r){
@ -138,8 +115,7 @@ class Matrix implements ArrayAccess{
}
return $result;
}
//Naive Matrix product, O(n^3)
public function product(Matrix $matrix){
if($this->columns !== $matrix->getRows()){
return false;
@ -157,9 +133,9 @@ class Matrix implements ArrayAccess{
}
return $result;
}
//Computation of the determinant of 2x2 and 3x3 matrices
//Naive Matrix product, O(n^3)
public function determinant(){
if($this->isSquare() !== true){
return false;
@ -174,14 +150,20 @@ class Matrix implements ArrayAccess{
}
return false;
}
//Computation of the determinant of 2x2 and 3x3 matrices
public function isSquare(){
return $this->rows === $this->columns;
}
public function __toString(){
$s = "";
for($r = 0; $r < $this->rows; ++$r){
$s .= implode(",", $this->matrix[$r]).";";
$s .= implode(",", $this->matrix[$r]) . ";";
}
return "Matrix({$this->rows}x{$this->columns};".substr($s, 0, -1).")";
return "Matrix({$this->rows}x{$this->columns};" . substr($s, 0, -1) . ")";
}
}