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

Bug fix and optimize tsp algo

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-10-31 19:18:04 +01:00
parent 93e8182eb9
commit c50a00b70e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Math/Optimization/TSP/City.php
View File

@ -61,7 +61,7 @@ class City
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function __construct(float $lat, float $long, string $name) public function __construct(float $lat = 0, float $long = 0, string $name = '')
{ {
$this->long = $long; $this->long = $long;
$this->lat = $lat; $this->lat = $lat;
@ -107,7 +107,7 @@ class City
} }
/** /**
* Distance to city * Distance to city in meter
* *
* @param City $city City * @param City $city City
* *

12
Math/Optimization/TSP/GA.php
View File

@ -94,9 +94,9 @@ class GA
$newPopulation->set($i, $child); $newPopulation->set($i, $child);
} }
$count = $newPopulation->count(); $count2 = $newPopulation->count();
for ($i = $shift; $i < $count; $i++) { for ($i = $shift; $i < $count2; $i++) {
$this->mutate($newPopulation->get($i)); $this->mutate($newPopulation->get($i));
} }
@ -115,7 +115,7 @@ class GA
private function tournamentSelection(Population $population) : Tour private function tournamentSelection(Population $population) : Tour
{ {
$tournament = new Population($this->cityPool, self::TOURNAMENT, false); $tournament = new Population($this->cityPool, self::TOURNAMENT, false);
$populationSize = $population->count(); $populationSize = $population->count() - 1;
for ($i = 0; $i < self::TOURNAMENT; $i++) { for ($i = 0; $i < self::TOURNAMENT; $i++) {
$tournament->add($population->get(mt_rand(0, $populationSize))); $tournament->add($population->get(mt_rand(0, $populationSize)));
@ -138,8 +138,8 @@ class GA
{ {
$child = new Tour($this->cityPool, false); $child = new Tour($this->cityPool, false);
$start = mt_rand(0, $tour1->count()); $start = mt_rand(0, $tour1->count() - 1);
$end = mt_rand(0, $tour1->count()); $end = mt_rand(0, $tour1->count() - 1);
$count = $child->count(); /* $tour1->count() ???!!!! */ $count = $child->count(); /* $tour1->count() ???!!!! */
@ -182,7 +182,7 @@ class GA
for ($pos1 = 0; $pos1 < $count; $pos1++) { for ($pos1 = 0; $pos1 < $count; $pos1++) {
if (mt_rand(0, 1000) < self::MUTATION) { if (mt_rand(0, 1000) < self::MUTATION) {
$pos2 = mt_rand(0, $tour->count()); $pos2 = mt_rand(0, $tour->count() - 1);
/* Could be same pos! */ /* Could be same pos! */
$city1 = $tour->getCity($pos1); $city1 = $tour->getCity($pos1);