dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Braces +29 added lines, -19 removed lines

@@ -158,11 +158,12 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(OptimiseException $e) {
-            if(!$e->isEmpty())
-                \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
+        } catch(OptimiseException $e) {
+            if(!$e->isEmpty()) {
+                            \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
+            }
             throw $e;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             //TODO use the correct exceptions to avoid to share private data
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -207,8 +208,9 @@ 
     {
         //since we consider busy timeslots, we need to get all users
         $users = $this->company->employees->pluck('id')->toArray();
-        if(count($users) == 0)
-            throw ((new OptimiseException("No users for this company"))->withEmpty(true));
+        if(count($users) == 0) {
+                    throw ((new OptimiseException("No users for this company"))->withEmpty(true));
+        }
         return $solver->setUsers($users);
     }
 
@@ -223,8 +225,9 @@ 
          * @var $meetings \Illuminate\Support\Collection
          */
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
-        if($meetings->count() == 0)
-            throw ((new OptimiseException("No meetings for this week"))->withEmpty(true));
+        if($meetings->count() == 0) {
+                    throw ((new OptimiseException("No meetings for this week"))->withEmpty(true));
+        }
         $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots
             return $this->durationConverter($this->timeSlotsConverter($item));
         });
@@ -298,8 +301,9 @@ 
     {
         $ret = [];
         foreach ($ids as $id) {
-            if(isset($timeSlots[$id]))
-                $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0');
+            if(isset($timeSlots[$id])) {
+                            $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0');
+            }
             $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
         }
 
@@ -316,8 +320,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach ($timeSlots as $timeSlot) {
-            if (!isset($array[$id]))
-                $array[$id] = [];
+            if (!isset($array[$id])) {
+                            $array[$id] = [];
+            }
             $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
@@ -332,8 +337,9 @@ 
      */
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
-        for ($i = $from; $i < $to; $i++)
-            $array[$i] = $pad;
+        for ($i = $from; $i < $to; $i++) {
+                    $array[$i] = $pad;
+        }
         return $array;
     }
 
@@ -346,8 +352,9 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for ($i = 1; $i <= $until; $i++) {
-            if (!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if (!isset($array[$id][$i])) {
+                            $array[$id][$i] = $fill;
+            }
         }
 
         return $array;
@@ -386,8 +393,9 @@ 
          * @var $usersMeetings \Illuminate\Support\Collection
          */
         $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id');
-        if($usersMeetings->count() == 0)
-            throw ((new OptimiseException("No users for any meeting"))->withEmpty(true));
+        if($usersMeetings->count() == 0) {
+                    throw ((new OptimiseException("No users for any meeting"))->withEmpty(true));
+        }
 
         return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings));
     }
@@ -464,8 +472,10 @@ 
     {
         $ret = clone $this->startTime;
         //TODO check, because the meetings cannot have this date available -> this to avoid errors if we don't have a date for a meeting
-        if ($timeslot <= 1) //false == 0
+        if ($timeslot <= 1) {
+            //false == 0
             return $ret;
+        }
         return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S'));
     }
 

app/Console/Commands/Optimise/Solver.php

Braces +60 added lines, -40 removed lines

@@ -104,8 +104,9 @@ 
      */
     static private function checkGlpsol()
     {
-        if (!(`which glpsol`))
-            throw new OptimiseException('glpsol is not installed');
+        if (!(`which glpsol`)) {
+                    throw new OptimiseException('glpsol is not installed');
+        }
     }
 
     /**
@@ -193,8 +194,9 @@ 
      */
     public function setTimeSlots($timeSlots)
     {
-        if (!is_int($timeSlots) || $timeSlots <= 0)
-            throw new OptimiseException($timeSlots . ' is not integer or it is not >0');
+        if (!is_int($timeSlots) || $timeSlots <= 0) {
+                    throw new OptimiseException($timeSlots . ' is not integer or it is not >0');
+        }
 
         $this->timeSlots = $timeSlots;
         return $this;
@@ -215,8 +217,9 @@ 
      */
     public function setMaxTimeSlots($maxTimeSlots)
     {
-        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
-            throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0');
+        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) {
+                    throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0');
+        }
 
         $this->maxTimeSlots = $maxTimeSlots;
         return $this;
@@ -238,13 +241,15 @@ 
     public function setMeetingsAvailability($meetingsAvailability)
     {
         $meetings = array_keys($meetingsAvailability);
-        if (array_diff($meetings, $this->meetings))
-            throw new OptimiseException('meetings different from meetings set');
+        if (array_diff($meetings, $this->meetings)) {
+                    throw new OptimiseException('meetings different from meetings set');
+        }
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
             $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
             //TODO check if keys are sequential and the last is the same with $this->timeSlots
-            if (count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if (count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
             $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
@@ -261,8 +266,9 @@ 
     static private function arrayPad(array $array, $len, $pad)
     {
         $len = $len - count($array);
-        for ($i = 0; $i < $len; $i++)
-            $array[] = $pad;
+        for ($i = 0; $i < $len; $i++) {
+                    $array[] = $pad;
+        }
         return $array;
     }
 
@@ -287,8 +293,9 @@ 
         }
         foreach ($meetingsDuration as $duration) {
             $duration = (int)$duration; //TODO fix this (fix for optimise)
-            if (!is_int($duration) || $duration <= 0)
-                throw new OptimiseException('duration is not integer or it is not >0');
+            if (!is_int($duration) || $duration <= 0) {
+                            throw new OptimiseException('duration is not integer or it is not >0');
+            }
         }
 
         $this->meetingsDuration = $meetingsDuration;
@@ -311,12 +318,14 @@ 
     public function setUsersAvailability($usersAvailability)
     {
         $users = array_keys($usersAvailability);
-        if (array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if (array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
             $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
-            if (count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if (count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
 
             $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
@@ -341,12 +350,14 @@ 
     public function setUsersMeetings($usersMeetings)
     {
         $users = array_keys($usersMeetings);
-        if (array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if (array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach ($usersMeetings as $usersMeetingsS) {
             $meetings = array_keys($usersMeetingsS);
-            if (array_diff($meetings, $this->meetings))
-                throw new OptimiseException('meetings different from meetings set');
+            if (array_diff($meetings, $this->meetings)) {
+                            throw new OptimiseException('meetings different from meetings set');
+            }
         }
 
         $this->usersMeetings = $usersMeetings;
@@ -363,8 +374,9 @@ 
         $this->writeModelFile();
         $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
         }); //this just to execute in foreground
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
         //TODO catch glpsol errors
         return $this;
     }
@@ -398,9 +410,10 @@ 
      */
     private function checkArrayProprieties($proprieties)
     {
-        foreach ($proprieties as $propriety)
-            if (count($this->$propriety) == 0)
+        foreach ($proprieties as $propriety) {
+                    if (count($this->$propriety) == 0)
                 throw new OptimiseException($propriety . ' property is not set correctly');
+        }
     }
 
     /**
@@ -409,9 +422,10 @@ 
      */
     private function checkIntProprieties($proprieties)
     {
-        foreach ($proprieties as $propriety)
-            if (!is_int($this->$propriety) || $this->$propriety <= 0)
+        foreach ($proprieties as $propriety) {
+                    if (!is_int($this->$propriety) || $this->$propriety <= 0)
                 throw new OptimiseException($propriety . ' property is not set correctly');
+        }
     }
 
     /**
@@ -448,8 +462,9 @@ 
     static private function writeCSV($file, $data, $heading, \Closure $writer)
     {
         $fp = @fopen($file, 'w');
-        if (!$fp)
-            throw new OptimiseException('problem during creation of a file');
+        if (!$fp) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
 
         fputcsv($fp, $heading);
 
@@ -511,8 +526,9 @@ 
     {
         $f = function ($fp, $data) {
             foreach ($data as $key => $field) {
-                foreach ($field as $key2 => $field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                foreach ($field as $key2 => $field2) {
+                                    fputcsv($fp, [$key, $key2, $field2]);
+                }
             }
         };
 
@@ -543,8 +559,9 @@ 
         $strReplaceS = array('{USERS_PATH}', '{MEETINGS_PATH}', '{USER_AVAILABILITY_PATH}', '{MEETINGS_AVAILABILITY_PATH}', '{USER_MEETINGS_PATH}', '{MEETINGS_DURATION_PATH}', '{TIME_SLOTS}', '{MAX_TIME_SLOTS}', '{X_OUT_PATH}', '{Y_OUT_PATH}');
         $strReplaceR = array($this->path->getUsersPath(), $this->path->getMeetingsPath(), $this->path->getUsersAvailabilityPath(), $this->path->getMeetingsAvailabilityPath(), $this->path->getUsersMeetingsPath(), $this->path->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->path->getXPath(), $this->path->getYPath());
         $f = @fopen($this->path->getModelPath(), "w");
-        if (!$f)
-            throw new OptimiseException('problem during creation of a file');
+        if (!$f) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
         fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
         fclose($f);
     }
@@ -565,12 +582,14 @@ 
      */
     static private function readCSVFile($file)
     {
-        if (!file_exists($file) || !filesize($file))
-            throw new OptimiseException('no results file');
+        if (!file_exists($file) || !filesize($file)) {
+                    throw new OptimiseException('no results file');
+        }
 
         $handle = @fopen($file, "r");
-        if (!$handle)
-            throw new OptimiseException('problems during reading the file');
+        if (!$handle) {
+                    throw new OptimiseException('problems during reading the file');
+        }
 
         $ret = [];
         fgetcsv($handle); //skip head
@@ -603,8 +622,9 @@ 
      */
     public function getOutput()
     {
-        if (!($data = file_get_contents($this->path->getOutputPath())))
-            throw new OptimiseException('problems during reading the file');
+        if (!($data = file_get_contents($this->path->getOutputPath()))) {
+                    throw new OptimiseException('problems during reading the file');
+        }
         return $data;
     }
 }
\ No newline at end of file