@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | public function setTimeSlots($timeSlots) |
195 | 195 | { |
196 | 196 | if (!is_int($timeSlots) || $timeSlots <= 0) |
197 | - throw new OptimiseException($timeSlots . ' is not integer or it is not >0'); |
|
197 | + throw new OptimiseException($timeSlots.' is not integer or it is not >0'); |
|
198 | 198 | |
199 | 199 | $this->timeSlots = $timeSlots; |
200 | 200 | return $this; |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | public function setMaxTimeSlots($maxTimeSlots) |
217 | 217 | { |
218 | 218 | if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) |
219 | - throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0'); |
|
219 | + throw new OptimiseException($maxTimeSlots.' is not integer or it is not >0'); |
|
220 | 220 | |
221 | 221 | $this->maxTimeSlots = $maxTimeSlots; |
222 | 222 | return $this; |
@@ -241,11 +241,11 @@ discard block |
||
241 | 241 | if (array_diff($meetings, $this->meetings)) |
242 | 242 | throw new OptimiseException('meetings different from meetings set'); |
243 | 243 | foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) { |
244 | - $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS |
|
244 | + $timeSlots = array_keys($meetingsAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS |
|
245 | 245 | //TODO check if keys are sequential and the last is the same with $this->timeSlots |
246 | 246 | if (count($timeSlots) != $this->timeSlots) |
247 | 247 | throw new OptimiseException('timeSlots different from timeSlots set'); |
248 | - $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
248 | + $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | $this->meetingsAvailability = $meetingsAvailability; |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | { |
263 | 263 | $len = $len - count($array); |
264 | 264 | for ($i = 0; $i < $len; $i++) |
265 | - $array[] = $pad; |
|
265 | + $array[ ] = $pad; |
|
266 | 266 | return $array; |
267 | 267 | } |
268 | 268 | |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | throw new OptimiseException('meetings different from meetings set'); |
287 | 287 | } |
288 | 288 | foreach ($meetingsDuration as $duration) { |
289 | - $duration = (int)$duration; //TODO fix this (fix for optimise) |
|
289 | + $duration = (int) $duration; //TODO fix this (fix for optimise) |
|
290 | 290 | if (!is_int($duration) || $duration <= 0) |
291 | 291 | throw new OptimiseException('duration is not integer or it is not >0'); |
292 | 292 | } |
@@ -314,11 +314,11 @@ discard block |
||
314 | 314 | if (array_diff($users, $this->users)) |
315 | 315 | throw new OptimiseException('users different from users set'); |
316 | 316 | foreach ($usersAvailability as $key => $usersAvailabilityS) { |
317 | - $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS |
|
317 | + $timeSlots = array_keys($usersAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS |
|
318 | 318 | if (count($timeSlots) != $this->timeSlots) |
319 | 319 | throw new OptimiseException('timeSlots different from timeSlots set'); |
320 | 320 | |
321 | - $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
321 | + $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | $this->usersAvailability = $usersAvailability; |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | { |
362 | 362 | $this->writeData(); |
363 | 363 | $this->writeModelFile(); |
364 | - $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () { |
|
364 | + $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function() { |
|
365 | 365 | }); //this just to execute in foreground |
366 | 366 | if ($event->isDue($this->laravel)) |
367 | 367 | $event->run($this->laravel); |
@@ -388,8 +388,8 @@ discard block |
||
388 | 388 | */ |
389 | 389 | private function checkData() |
390 | 390 | { |
391 | - $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']); |
|
392 | - $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']); |
|
391 | + $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]); |
|
392 | + $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]); |
|
393 | 393 | } |
394 | 394 | |
395 | 395 | /** |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | { |
401 | 401 | foreach ($proprieties as $propriety) |
402 | 402 | if (count($this->$propriety) == 0) |
403 | - throw new OptimiseException($propriety . ' property is not set correctly'); |
|
403 | + throw new OptimiseException($propriety.' property is not set correctly'); |
|
404 | 404 | } |
405 | 405 | |
406 | 406 | /** |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | { |
412 | 412 | foreach ($proprieties as $propriety) |
413 | 413 | if (!is_int($this->$propriety) || $this->$propriety <= 0) |
414 | - throw new OptimiseException($propriety . ' property is not set correctly'); |
|
414 | + throw new OptimiseException($propriety.' property is not set correctly'); |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | /** |
@@ -429,13 +429,13 @@ discard block |
||
429 | 429 | */ |
430 | 430 | static private function writeCSVArrayNoKey($file, $data) |
431 | 431 | { |
432 | - $f = function ($fp, $data) { |
|
432 | + $f = function($fp, $data) { |
|
433 | 433 | foreach ($data as $field) { |
434 | - fputcsv($fp, [$field]); |
|
434 | + fputcsv($fp, [ $field ]); |
|
435 | 435 | } |
436 | 436 | }; |
437 | 437 | |
438 | - self::writeCSV($file, $data, ['i'], $f); |
|
438 | + self::writeCSV($file, $data, [ 'i' ], $f); |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | /** |
@@ -484,13 +484,13 @@ discard block |
||
484 | 484 | */ |
485 | 485 | static private function writeCSVArray($file, $data, $name) |
486 | 486 | { |
487 | - $f = function ($fp, $data) { |
|
487 | + $f = function($fp, $data) { |
|
488 | 488 | foreach ($data as $key => $field) { |
489 | - fputcsv($fp, [$key, $field]); |
|
489 | + fputcsv($fp, [ $key, $field ]); |
|
490 | 490 | } |
491 | 491 | }; |
492 | 492 | |
493 | - self::writeCSV($file, $data, ['i', $name], $f); |
|
493 | + self::writeCSV($file, $data, [ 'i', $name ], $f); |
|
494 | 494 | } |
495 | 495 | |
496 | 496 | /** |
@@ -509,14 +509,14 @@ discard block |
||
509 | 509 | */ |
510 | 510 | static private function writeCSVMatrix($file, $data, $name) |
511 | 511 | { |
512 | - $f = function ($fp, $data) { |
|
512 | + $f = function($fp, $data) { |
|
513 | 513 | foreach ($data as $key => $field) { |
514 | 514 | foreach ($field as $key2 => $field2) |
515 | - fputcsv($fp, [$key, $key2, $field2]); |
|
515 | + fputcsv($fp, [ $key, $key2, $field2 ]); |
|
516 | 516 | } |
517 | 517 | }; |
518 | 518 | |
519 | - self::writeCSV($file, $data, ['i', 'j', $name], $f); |
|
519 | + self::writeCSV($file, $data, [ 'i', 'j', $name ], $f); |
|
520 | 520 | } |
521 | 521 | |
522 | 522 | /** |
@@ -545,7 +545,7 @@ discard block |
||
545 | 545 | $f = @fopen($this->path->getModelPath(), "w"); |
546 | 546 | if (!$f) |
547 | 547 | throw new OptimiseException('problem during creation of a file'); |
548 | - fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub"))); |
|
548 | + fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub"))); |
|
549 | 549 | fclose($f); |
550 | 550 | } |
551 | 551 | |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | if (!$handle) |
573 | 573 | throw new OptimiseException('problems during reading the file'); |
574 | 574 | |
575 | - $ret = []; |
|
575 | + $ret = [ ]; |
|
576 | 576 | fgetcsv($handle); //skip head |
577 | 577 | while (($data = fgetcsv($handle)) !== FALSE) { |
578 | 578 | if (count($data) != 3) { |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | throw new OptimiseException('problems during parsing the file'); |
581 | 581 | } |
582 | 582 | |
583 | - $ret[$data[0]][$data[1]] = $data[2]; |
|
583 | + $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ]; |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | fclose($handle); |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | { |
86 | 86 | $this->startTime = clone $startTime; |
87 | 87 | $this->endTime = clone $this->startTime; |
88 | - $this->endTime->add(new \DateInterval('PT' . ($this->time_slots * |
|
89 | - config('app.timeslots.duration')) . 'S')); |
|
88 | + $this->endTime->add(new \DateInterval('PT'.($this->time_slots * |
|
89 | + config('app.timeslots.duration')).'S')); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -158,11 +158,11 @@ discard block |
||
158 | 158 | $solver = $this->setData($solver); |
159 | 159 | $solver = $solver->solve(); |
160 | 160 | $this->solver = $solver; |
161 | - }catch(OptimiseException $e) { |
|
162 | - if(!$e->isEmpty()) |
|
161 | + } catch (OptimiseException $e) { |
|
162 | + if (!$e->isEmpty()) |
|
163 | 163 | \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
164 | 164 | throw $e; |
165 | - }catch (\Exception $e) { |
|
165 | + } catch (\Exception $e) { |
|
166 | 166 | //TODO use the correct exceptions to avoid to share private data |
167 | 167 | \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
168 | 168 | throw new OptimiseException('Optimising error', 0, $e); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | { |
208 | 208 | //since we consider busy timeslots, we need to get all users |
209 | 209 | $users = $this->company->employees->pluck('id')->toArray(); |
210 | - if(count($users) == 0) |
|
210 | + if (count($users) == 0) |
|
211 | 211 | throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
212 | 212 | return $solver->setUsers($users); |
213 | 213 | } |
@@ -223,9 +223,9 @@ discard block |
||
223 | 223 | * @var $meetings \Illuminate\Support\Collection |
224 | 224 | */ |
225 | 225 | $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime)); |
226 | - if($meetings->count() == 0) |
|
226 | + if ($meetings->count() == 0) |
|
227 | 227 | throw ((new OptimiseException("No meetings for this week"))->withEmpty(true)); |
228 | - $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots |
|
228 | + $timeslots = $meetings->groupBy('id')->map(function($item) { //convert timeslots |
|
229 | 229 | return $this->durationConverter($this->timeSlotsConverter($item)); |
230 | 230 | }); |
231 | 231 | return $solver->setMeetings($timeslots->keys()->toArray()) |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | */ |
241 | 241 | private function durationConverter($item) |
242 | 242 | { |
243 | - return $item->each(function ($item2) { |
|
244 | - $item2->duration = $this->convertDuration((int)$item2->duration); |
|
243 | + return $item->each(function($item2) { |
|
244 | + $item2->duration = $this->convertDuration((int) $item2->duration); |
|
245 | 245 | return $item2; |
246 | 246 | //TODO try catch |
247 | 247 | }); |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | */ |
254 | 254 | static private function convertDuration($duration) |
255 | 255 | { |
256 | - return (int)ceil($duration / config('app.timeslots.duration')); |
|
256 | + return (int) ceil($duration / config('app.timeslots.duration')); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | /** |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | */ |
263 | 263 | private function timeSlotsConverter($item) |
264 | 264 | { |
265 | - return $item->each(function ($item2) { |
|
265 | + return $item->each(function($item2) { |
|
266 | 266 | $item2->time_start = $this->toTimeSlot($item2->time_start); |
267 | 267 | $item2->time_end = $this->toTimeSlot($item2->time_end); |
268 | 268 | return $item2; |
@@ -280,13 +280,13 @@ discard block |
||
280 | 280 | $dateTime = new \DateTime($time); |
281 | 281 | $diff = $dateTime->diff($this->startTime); |
282 | 282 | $diff = explode(':', $diff->format('%R:%d:%h:%i:%s')); |
283 | - $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4]; |
|
283 | + $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ]; |
|
284 | 284 | //if($diff[0] != '-' && $diff != 0) |
285 | 285 | // throw new OptimiseException('timeslot time <= startTime'); |
286 | 286 | //TODO fix check |
287 | 287 | //TODO check if diff makes sense |
288 | 288 | //TODO check upper limit |
289 | - return (int)(round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps? |
|
289 | + return (int) (round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps? |
|
290 | 290 | } |
291 | 291 | |
292 | 292 | /** |
@@ -299,10 +299,10 @@ discard block |
||
299 | 299 | */ |
300 | 300 | static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeSlotsN, array $ids, $free = true) |
301 | 301 | { |
302 | - $ret = []; |
|
302 | + $ret = [ ]; |
|
303 | 303 | foreach ($ids as $id) { |
304 | - if(isset($timeSlots[$id])) |
|
305 | - $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0'); |
|
304 | + if (isset($timeSlots[ $id ])) |
|
305 | + $ret = self::fillTimeSlots($ret, $id, $timeSlots[ $id ], $free ? '1' : '0'); |
|
306 | 306 | $ret = self::fillRow($ret, $id, $timeSlotsN, $free ? '0' : '1'); |
307 | 307 | } |
308 | 308 | |
@@ -319,9 +319,9 @@ discard block |
||
319 | 319 | static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0') |
320 | 320 | { |
321 | 321 | foreach ($timeSlots as $timeSlot) { |
322 | - if (!isset($array[$id])) |
|
323 | - $array[$id] = []; |
|
324 | - $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
322 | + if (!isset($array[ $id ])) |
|
323 | + $array[ $id ] = [ ]; |
|
324 | + $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
325 | 325 | } |
326 | 326 | return $array; |
327 | 327 | } |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') |
337 | 337 | { |
338 | 338 | for ($i = $from; $i < $to; $i++) |
339 | - $array[$i] = $pad; |
|
339 | + $array[ $i ] = $pad; |
|
340 | 340 | return $array; |
341 | 341 | } |
342 | 342 | |
@@ -349,8 +349,8 @@ discard block |
||
349 | 349 | static private function fillRow(array $array, $id, $until, $fill = '0') |
350 | 350 | { |
351 | 351 | for ($i = 1; $i <= $until; $i++) { |
352 | - if (!isset($array[$id][$i])) |
|
353 | - $array[$id][$i] = $fill; |
|
352 | + if (!isset($array[ $id ][ $i ])) |
|
353 | + $array[ $id ][ $i ] = $fill; |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | return $array; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime)); |
370 | 370 | //if($users->count() == 0) |
371 | 371 | // throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
372 | - $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots |
|
372 | + $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots |
|
373 | 373 | return $this->timeSlotsConverter($item); |
374 | 374 | }); |
375 | 375 | return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, $solver->getUsers(), |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | * @var $usersMeetings \Illuminate\Support\Collection |
390 | 390 | */ |
391 | 391 | $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id'); |
392 | - if($usersMeetings->count() == 0) |
|
392 | + if ($usersMeetings->count() == 0) |
|
393 | 393 | throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
394 | 394 | |
395 | 395 | return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings)); |
@@ -403,14 +403,14 @@ discard block |
||
403 | 403 | */ |
404 | 404 | static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings) |
405 | 405 | { |
406 | - $ret = []; |
|
406 | + $ret = [ ]; |
|
407 | 407 | foreach ($users as $user) { |
408 | 408 | $usersMeetingsTmp = $usersMeetings->get($user); |
409 | 409 | foreach ($meetings as $meeting) { |
410 | 410 | if ($usersMeetingsTmp != null && $usersMeetingsTmp->contains('meeting_id', $meeting)) { |
411 | - $ret[$user][$meeting] = 1; |
|
411 | + $ret[ $user ][ $meeting ] = 1; |
|
412 | 412 | } else { |
413 | - $ret[$user][$meeting] = 0; |
|
413 | + $ret[ $user ][ $meeting ] = 0; |
|
414 | 414 | } |
415 | 415 | } |
416 | 416 | } |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | { |
454 | 454 | $meetings = $solver->getYResults(); |
455 | 455 | foreach ($meetings as $id => $meeting) { |
456 | - $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error |
|
456 | + $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error |
|
457 | 457 | $meetingO->start_time = $this->toDateTime(array_search('1', $meeting)); |
458 | 458 | $meetingO->save(); |
459 | 459 | } |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | //TODO check, because the meetings cannot have this date available -> this to avoid errors if we don't have a date for a meeting |
470 | 470 | if ($timeslot <= 1) //false == 0 |
471 | 471 | return $ret; |
472 | - return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S')); |
|
472 | + return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * config('app.timeslots.duration')).'S')); |
|
473 | 473 | } |
474 | 474 | |
475 | 475 | /** |
@@ -481,7 +481,7 @@ discard block |
||
481 | 481 | foreach ($employeesMeetings as $eId => $employeeMeetings) { |
482 | 482 | $employee = \plunner\Employee::findOrFail($eId); |
483 | 483 | $employeeMeetings = collect($employeeMeetings); |
484 | - $employeeMeetings = $employeeMeetings->filter(function ($item) { |
|
484 | + $employeeMeetings = $employeeMeetings->filter(function($item) { |
|
485 | 485 | return $item == 1; |
486 | 486 | }); |
487 | 487 | $employee->meetings()->attach($employeeMeetings->keys()->toArray()); |