dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Spacing +36 added lines, -36 removed lines

@@ -24,7 +24,7 @@ 
     //TODo max timeslots can be an environment var
     const TIME_SLOT_DURATION = 900; //seconds -> 15 minutes
     const DEFAULT_MAX_TIME_SLOTS = 20; //max duration of a meeting in term of timeslots //20
-    const DEFAULT_TIME_SLOTS = 672;  //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
+    const DEFAULT_TIME_SLOTS = 672; //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
 
     private $max_time_slots = self::DEFAULT_MAX_TIME_SLOTS;
     private $time_slots = self::DEFAULT_TIME_SLOTS;
@@ -85,7 +85,7 @@ 
     {
         $this->startTime = clone $startTime;
         $this->endTime = clone $this->startTime;
-        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots+$this->time_slots)*self::TIME_SLOT_DURATION).'S'));
+        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -156,7 +156,7 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(\Exception $e)
+        } catch (\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -170,7 +170,7 @@ 
      */
     public function save()
     {
-        if(!($this->solver instanceof Solver)) {
+        if (!($this->solver instanceof Solver)) {
             \Event::fire(new ErrorEvent($this->company, 'solver is not an instace of Solver'));
             throw new OptimiseException('solver is not an instance of Solver');
             return;
@@ -180,7 +180,7 @@ 
         try {
             $this->saveMeetings($this->solver);
             $this->saveEmployeesMeetings($this->solver);
-        }catch(\Exception $e)
+        } catch (\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -197,8 +197,8 @@ 
     private function saveMeetings(Solver $solver)
     {
         $meetings = $solver->getYResults();
-        foreach($meetings as $id=>$meeting){
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
+        foreach ($meetings as $id=>$meeting) {
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
             $meetingO->save();
         }
@@ -210,11 +210,11 @@ 
     private function saveEmployeesMeetings(Solver $solver)
     {
         $employeesMeetings = $solver->getXResults();
-        foreach($employeesMeetings as $eId =>$employeeMeetings)
+        foreach ($employeesMeetings as $eId =>$employeeMeetings)
         {
             $employee = \plunner\Employee::findOrFail($eId);
             $employeeMeetings = collect($employeeMeetings);
-            $employeeMeetings = $employeeMeetings->filter(function ($item) {
+            $employeeMeetings = $employeeMeetings->filter(function($item) {
                 return $item == 1;
             });
             $employee->meetings()->attach($employeeMeetings->keys()->toArray());
@@ -272,7 +272,7 @@ 
                 return $this->timeSlotsConverter($item);
             });
         return $solver->setMeetings($timeslots->keys()->toArray())
-            ->setMeetingsDuration($meetings->pluck('duration','id')->toArray())
+            ->setMeetingsDuration($meetings->pluck('duration', 'id')->toArray())
             ->setMeetingsAvailability(self::getAvailabilityArray($timeslots, $this->time_slots));
     }
 
@@ -318,15 +318,15 @@ 
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
-        $ret = [];
-        foreach($users as $user)
+        $ret = [ ];
+        foreach ($users as $user)
         {
             $usersMeetingsTmp = $usersMeetings->get($user);
-            foreach($meetings as $meeting){
-                if($usersMeetingsTmp->contains('meeting_id', $meeting)){
-                    $ret[$user][$meeting] = 1;
-                }else{
-                    $ret[$user][$meeting] = 0;
+            foreach ($meetings as $meeting) {
+                if ($usersMeetingsTmp->contains('meeting_id', $meeting)) {
+                    $ret[ $user ][ $meeting ] = 1;
+                } else {
+                    $ret[ $user ][ $meeting ] = 0;
                 }
             }
         }
@@ -336,7 +336,7 @@ 
 
     private function timeSlotsConverter($item)
     {
-        return $item->each(function($item2){
+        return $item->each(function($item2) {
             $item2->time_start = $this->toTimeSlot($item2->time_start);
             $item2->time_end = $this->toTimeSlot($item2->time_end);
             return $item2;
@@ -349,13 +349,13 @@ 
      * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
      * @return array
      */
-    static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free=true)
+    static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
     {
-        $ret = [];
-        foreach($timeSlots as $id=>$timeSlots2)
+        $ret = [ ];
+        foreach ($timeSlots as $id=>$timeSlots2)
         {
-            $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free?'1':'0');
-            $ret = self::fillRow($ret, $id, $timeslotsN, $free?'0':'1');
+            $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0');
+            $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
         }
 
         return $ret;
@@ -370,10 +370,10 @@ 
      */
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
-        foreach($timeSlots as $timeSlot) {
-            if(!isset($array[$id]))
-                $array[$id] = [];
-            $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
+        foreach ($timeSlots as $timeSlot) {
+            if (!isset($array[ $id ]))
+                $array[ $id ] = [ ];
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
     }
@@ -386,9 +386,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;
+        for ($i = 1; $i <= $until; $i++) {
+            if (!isset($array[ $id ][ $i ]))
+                $array[ $id ][ $i ] = $fill;
         }
 
         return $array;
@@ -403,8 +403,8 @@ 
      */
     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;
     }
 
@@ -418,14 +418,14 @@ 
     {
         $dateTime = new \DateTime($time);
         $diff = $dateTime->diff($this->startTime);
-        $diff = explode(':',$diff->format('%R:%d:%h:%i:%s'));
-        $diff = $diff[1]*86400 + $diff[2]*3600 + $diff[3]*60 + $diff[4];
+        $diff = explode(':', $diff->format('%R:%d:%h:%i:%s'));
+        $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ];
         //if($diff[0] != '-' && $diff != 0)
           //  throw new OptimiseException('timeslot time <= startTime');
         //TODO fix check
         //TODO check if diff makes sense
         //TODO check upper limit
-        return (int)(round($diff/self::TIME_SLOT_DURATION)+1); //TODO can round cause overlaps?
+        return (int) (round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps?
     }
 
     /**
@@ -435,6 +435,6 @@ 
     private function toDateTime($timeslot)
     {
         $ret = clone $this->startTime;
-        return $ret->add(new \DateInterval('PT'.(($timeslot-1)*self::TIME_SLOT_DURATION).'S'));
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * self::TIME_SLOT_DURATION).'S'));
     }
 }
\ No newline at end of file