dsd-meetme / backend

app/Console/Commands/Optimise/Solver.php

Braces +60 added lines, -40 removed lines

@@ -112,8 +112,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,12 +241,14 @@ 
     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);
-            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);
         }
 
@@ -273,8 +278,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;
@@ -297,12 +303,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);
-            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);
         }
@@ -327,12 +335,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;
@@ -430,8 +440,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]);
+                }
             }
         };
 
@@ -448,8 +459,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);
 
@@ -469,8 +481,9 @@ 
         $this->writeData();
         $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;
     }
@@ -483,8 +496,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);
     }
@@ -513,8 +527,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;
     }
 
@@ -525,12 +540,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
@@ -577,9 +594,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.' is not set correctly');
+        }
     }
 
     /**
@@ -588,9 +606,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.' is not set correctly');
+        }
     }
 
     /**
@@ -602,8 +621,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;
     }
 }
\ No newline at end of file

app/Console/Commands/Optimise/Path.php

Braces +13 added lines, -8 removed lines

@@ -48,8 +48,9 @@ 
      */
     public function __destruct()
     {
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
-            throw new OptimiseException('problems during removing of path directory');
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
+                    throw new OptimiseException('problems during removing of path directory');
+        }
     }
 
     /**
@@ -76,12 +77,16 @@ 
     {
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
         unlink($path->getPath()); //remove file to create a dir
-        if(file_exists($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        if(file_exists($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
+        }
+        if(!@mkdir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
+        }
+        ;
+        if(! is_dir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        }
         return $path;
     }