ZsgsDesign / NOJ

app/Http/Controllers/VirtualJudge/Judge.php

Spacing +1 added lines, -1 removed lines

@@ -398,7 +398,7 @@
      */
     private function get_last_uva($earliest)
     {
-        $ret = [];
+        $ret=[];
         if (!$earliest) {
             return $ret;
         }

app/Models/AccountModel.php

Spacing +4 added lines, -4 removed lines

@@ -25,8 +25,8 @@ 
     public function feed($uid=null)
     {
         $ret=[];
-        $solution=DB::table("problem_solution")->join("problem","problem.pid","=","problem_solution.pid")->where(["uid"=>$uid,"audit"=>1])->select("problem.pid as pid","pcode","title","problem_solution.created_at as created_at")->get()->all();
-        foreach($solution as &$s){
+        $solution=DB::table("problem_solution")->join("problem", "problem.pid", "=", "problem_solution.pid")->where(["uid"=>$uid, "audit"=>1])->select("problem.pid as pid", "pcode", "title", "problem_solution.created_at as created_at")->get()->all();
+        foreach ($solution as &$s) {
             $s["type"]="event";
             $s["color"]="wemd-orange";
             $s["icon"]="comment-check-outline";
@@ -91,8 +91,8 @@ 
             "verdict"=>"Accepted"
         ])->join("problem", "problem.pid", "=", "submission.pid")->select('pcode')->distinct()->get()->all();
         $ret["solvedCount"]=count($ret["solved"]);
-        $ret["rank"]=Cache::tags(['rank',$ret["id"]])->get("rank", "N/A");
-        $ret["rankTitle"]=Cache::tags(['rank',$ret["id"]])->get("title");
+        $ret["rank"]=Cache::tags(['rank', $ret["id"]])->get("rank", "N/A");
+        $ret["rankTitle"]=Cache::tags(['rank', $ret["id"]])->get("title");
         $ret["rankTitleColor"]=RankModel::getColor($ret["rankTitle"]);
         if (Cache::tags(['bing', 'pic'])->get(date("Y-m-d"))==null) {
             $bing=new BingPhoto([

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function showLinkRequestForm()
     {
-        return view('auth.passwords.email',[
+        return view('auth.passwords.email', [
             'page_title'=>"Reset Password",
             'site_title'=>"NOJ",
             'navigation' => "Account"

app/Http/Controllers/Auth/ResetPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -52,9 +52,9 @@
      * @param  string|null  $token
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function showResetForm(Request $request, $token = null)
+    public function showResetForm(Request $request, $token=null)
     {
-        return view('auth.passwords.reset',[
+        return view('auth.passwords.reset', [
             'token' => $token,
             'email' => $request->email,
             'page_title'=>"Reset Password",

app/Models/Rating/RatingCalculator.php

Braces +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
             $mid = floor(($right + $left)/2);
             if($this->getSeed($mid) < $rank){
                 $right = $mid;
-            }else{
+            } else{
                 $left = $mid;
             }
         }

Spacing +70 added lines, -70 removed lines

@@ -17,14 +17,14 @@ 
     public $totParticipants=0;
     public $INITIAL_RATING=1500;
 
-    public function __construct($cid){
+    public function __construct($cid) {
         $this->cid=$cid;
 
         // get rank
         $this->getRecord();
     }
 
-    private function getRecord(){
+    private function getRecord() {
         $contestRankRaw=Cache::tags(['contest', 'rank'])->get($this->$cid);
 
         if ($contestRankRaw==null) {
@@ -32,8 +32,8 @@ 
             $contestRankRaw=$contestModel->contestRankCache($this->$cid);
         }
 
-        $this->totParticipants = count($ret);
-        foreach($contestRankRaw as $c){
+        $this->totParticipants=count($ret);
+        foreach ($contestRankRaw as $c) {
             $this->contestants[]=[
                 "uid"=>$c["uid"],
                 "points"=>$c["score"],
@@ -42,121 +42,121 @@ 
         }
     }
 
-    private function reassignRank(){
+    private function reassignRank() {
         $this->sort("points");
-        $idx = 0;
-        $points = $this->contestants[0]["points"];
-        $i = 1;
-        while($i < $this->totParticipants){
-            if($this->contestants[$i]["points"] < $points){
-                $j = $idx;
-                while($j < $i){
-                    $this->contestants[$j]["rank"] = $i;
-                    $j += 1;
+        $idx=0;
+        $points=$this->contestants[0]["points"];
+        $i=1;
+        while ($i<$this->totParticipants) {
+            if ($this->contestants[$i]["points"]<$points) {
+                $j=$idx;
+                while ($j<$i) {
+                    $this->contestants[$j]["rank"]=$i;
+                    $j+=1;
                 }
-                $idx = $i;
-                $points = $this->contestants[$i]["points"];
+                $idx=$i;
+                $points=$this->contestants[$i]["points"];
             }
-            $i += 1;
+            $i+=1;
         }
-        $j = $idx;
-        while($j < $this->totParticipants){
-            $this->contestants[$j]["rank"] = $this->totParticipants;
-            $j += 1;
+        $j=$idx;
+        while ($j<$this->totParticipants) {
+            $this->contestants[$j]["rank"]=$this->totParticipants;
+            $j+=1;
         }
     }
 
-    private function getEloWinProbability($Ra, $Rb){
-        return 1.0 / (1 + pow(10, ($Rb-$Ra)/400.0));
+    private function getEloWinProbability($Ra, $Rb) {
+        return 1.0 / (1+pow(10, ($Rb-$Ra) / 400.0));
     }
 
-    private function getSeed($rating){
-        $result = 1.0;
-        foreach($this->contestants as $other){
-            $result += $this->getEloWinProbability($other["rating"], $rating);
+    private function getSeed($rating) {
+        $result=1.0;
+        foreach ($this->contestants as $other) {
+            $result+=$this->getEloWinProbability($other["rating"], $rating);
         }
         return $result;
     }
 
-    private function getRatingToRank($rank){
+    private function getRatingToRank($rank) {
         $left=1;
         $right=8000;
-        while($right - $left > 1){
-            $mid = floor(($right + $left)/2);
-            if($this->getSeed($mid) < $rank){
-                $right = $mid;
-            }else{
-                $left = $mid;
+        while ($right-$left>1) {
+            $mid=floor(($right+$left) / 2);
+            if ($this->getSeed($mid)<$rank) {
+                $right=$mid;
+            } else {
+                $left=$mid;
             }
         }
         return $left;
     }
 
-    private function sort($key){
-        usort($this->contestants, function ($a, $b) use ($key) {
+    private function sort($key) {
+        usort($this->contestants, function($a, $b) use ($key) {
             return $b[$key] <=> $a[$key];
         });
     }
 
-    public function calculate(){
-        if(empty($this->contestants)){
+    public function calculate() {
+        if (empty($this->contestants)) {
             return;
         }
 
         // recalc rank
         $this->reassignRank();
 
-        foreach($this->contestants as $member){
-            $member["seed"] = 1.0;
-            foreach($this->contestants as $other){
-                if($member["uid"] != $other["uid"]){
-                    $member["seed"] += $this->getEloWinProbability($other["rating"], $member["rating"]);
+        foreach ($this->contestants as $member) {
+            $member["seed"]=1.0;
+            foreach ($this->contestants as $other) {
+                if ($member["uid"]!=$other["uid"]) {
+                    $member["seed"]+=$this->getEloWinProbability($other["rating"], $member["rating"]);
                 }
             }
         }
 
-        foreach($this->contestants as $contestant){
-            $midRank = sqrt($contestant["rank"] * $contestant["seed"]);
-            $contestant["needRating"] = $this->getRatingToRank($midRank);
-            $contestant["delta"] = floor(($contestant["needRating"] - $contestant["rating"])/2);
+        foreach ($this->contestants as $contestant) {
+            $midRank=sqrt($contestant["rank"] * $contestant["seed"]);
+            $contestant["needRating"]=$this->getRatingToRank($midRank);
+            $contestant["delta"]=floor(($contestant["needRating"]-$contestant["rating"]) / 2);
         }
 
         $this->sort("rating");
 
         // DO some adjuct
         // Total sum should not be more than ZERO.
-        $sum = 0;
+        $sum=0;
 
-        foreach($this->contestants as $contestant){
-            $sum += $contestant["delta"];
+        foreach ($this->contestants as $contestant) {
+            $sum+=$contestant["delta"];
         }
-        $inc = -floor($sum / $this->totParticipants) - 1;
-        foreach($this->contestants as $contestant){
-            $contestant["delta"] += $inc;
+        $inc=-floor($sum / $this->totParticipants)-1;
+        foreach ($this->contestants as $contestant) {
+            $contestant["delta"]+=$inc;
         }
 
         // Sum of top-4*sqrt should be adjusted to ZERO.
 
-        $sum = 0;
-        $zeroSumCount = min(intval(4*round(sqrt($this->totParticipants))), $this->totParticipants);
+        $sum=0;
+        $zeroSumCount=min(intval(4 * round(sqrt($this->totParticipants))), $this->totParticipants);
 
-        for($i=0;$i<$zeroSumCount;$i++){
-            $sum += $this->contestants[i]["delta"];
+        for ($i=0; $i<$zeroSumCount; $i++) {
+            $sum+=$this->contestants[i]["delta"];
         }
 
-        $inc = min(max(-floor($sum / $zeroSumCount), -10), 0);
+        $inc=min(max(-floor($sum / $zeroSumCount), -10), 0);
 
-        for($i=0;$i<$zeroSumCount;$i++){
-            $this->contestants[i]["delta"] += $inc;
+        for ($i=0; $i<$zeroSumCount; $i++) {
+            $this->contestants[i]["delta"]+=$inc;
         }
 
         return $this->validateDeltas();
     }
 
-    public function storage(){
+    public function storage() {
         $contestants=$this->contestants;
-        DB::transaction(function () use ($contestants) {
-            foreach($contestants as $contestant){
+        DB::transaction(function() use ($contestants) {
+            foreach ($contestants as $contestant) {
                 $newRating=$contestant["rating"]+$contestant["delta"];
                 DB::table("users")->where([
                     "uid"=>$contestant["uid"]
@@ -167,20 +167,20 @@ 
         }, 5);
     }
 
-    private function validateDeltas(){
+    private function validateDeltas() {
         $this->sort("points");
 
-        for($i=0;$i<$this->totParticipants;$i++){
-            for($j=$i+1;$j<$this->totParticipants;$j++){
-                if($this->contestants[i]["rating"] > $this->contestants[j]["rating"]){
-                    if($this->contestants[i]["rating"] + $this->contestants[i]["delta"] < $this->contestants[j]["rating"] + $this->contestants[j]["delta"]){
+        for ($i=0; $i<$this->totParticipants; $i++) {
+            for ($j=$i+1; $j<$this->totParticipants; $j++) {
+                if ($this->contestants[i]["rating"]>$this->contestants[j]["rating"]) {
+                    if ($this->contestants[i]["rating"]+$this->contestants[i]["delta"]<$this->contestants[j]["rating"]+$this->contestants[j]["delta"]) {
                         Log::warning("First rating invariant failed: {$this->contestants[i]["uid"]} vs. {$this->contestants[j]["uid"]}.");
                         return false;
                     }
                 }
 
-                if($this->contestants[i]["rating"] < $this->contestants[j]["rating"]){
-                    if($this->contestants[i]["delta"] < $this->contestants[j]["delta"]){
+                if ($this->contestants[i]["rating"]<$this->contestants[j]["rating"]) {
+                    if ($this->contestants[i]["delta"]<$this->contestants[j]["delta"]) {
                         Log::warning("Second rating invariant failed: {$this->contestants[i]["uid"]} vs.  {$this->contestants[j]["uid"]}.");
                         return false;
                     }

app/Models/RankModel.php

Spacing +22 added lines, -22 removed lines

@@ -6,7 +6,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Arr;
-use Cache,Redis;
+use Cache, Redis;
 
 class RankModel extends Model
 {
@@ -64,26 +64,26 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if (is_null($rankTitle)) return "";
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if (is_null($rankTitle)) return self::$professionalRanking["None"];
         return self::$professionalRanking[$rankTitle];
     }
 
     public function list()
     {
         $rankList=Cache::tags(['rank'])->get('general');
-        $userInfoRaw=DB::table("users")->select("id as uid","avatar","name")->get()->all();
+        $userInfoRaw=DB::table("users")->select("id as uid", "avatar", "name")->get()->all();
         $userInfo=[];
-        foreach($userInfoRaw as $u){
+        foreach ($userInfoRaw as $u) {
             $userInfo[$u["uid"]]=$u;
         }
-        foreach($rankList as &$r){
-            $r["details"]=isset($userInfo[$r["uid"]])?$userInfo[$r["uid"]]:[];
+        foreach ($rankList as &$r) {
+            $r["details"]=isset($userInfo[$r["uid"]]) ? $userInfo[$r["uid"]] : [];
         }
         // var_dump($rankList); exit();
         return $rankList;
@@ -106,8 +106,8 @@ 
                     $rankSolved=$rankItem["totValue"];
                 }
                 $rankTitle=$this->getRankTitle($rankValue);
-                Cache::tags(['rank',$rankItem["uid"]])->put("rank", $rankValue, 86400);
-                Cache::tags(['rank',$rankItem["uid"]])->put("title", $rankTitle, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("rank", $rankValue, 86400);
+                Cache::tags(['rank', $rankItem["uid"]])->put("title", $rankTitle, 86400);
                 $rankListCached[]=[
                     "uid"=>$rankItem["uid"],
                     "rank"=>$rankValue,
@@ -124,14 +124,14 @@ 
 
     private function getProfessionalRanking()
     {
-        $professionalRankList = [];
-        $verifiedUsers = DB::table("users")->select("professional_rate","id as uid","avatar","name")->get()->all();
-        $rankIter = 0;
-        foreach($verifiedUsers as $user) {
-            $rankVal = $user['professional_rate'];
-            $rankTitle = $this->getProfessionalTitle($rankVal);
-            $titleColor = self::getProfessionalColor($rankTitle);
-            $professionalRankList[$rankIter++] = [
+        $professionalRankList=[];
+        $verifiedUsers=DB::table("users")->select("professional_rate", "id as uid", "avatar", "name")->get()->all();
+        $rankIter=0;
+        foreach ($verifiedUsers as $user) {
+            $rankVal=$user['professional_rate'];
+            $rankTitle=$this->getProfessionalTitle($rankVal);
+            $titleColor=self::getProfessionalColor($rankTitle);
+            $professionalRankList[$rankIter++]=[
                 "name"=>$user["name"],
                 "uid"=>$user["uid"],
                 "avatar"=>$user["avatar"],
@@ -153,7 +153,7 @@ 
                 $tot+=$c;
             }
             foreach ($this->casualRankingPer as &$c) {
-                $c=round($c*$totUsers/$tot);
+                $c=round($c * $totUsers / $tot);
                 $cur+=$c;
                 $c=$cur;
             }
@@ -164,16 +164,16 @@ 
 
     private function getRankTitle($rankVal)
     {
-        foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+        foreach ($this->casualRankingPer as $title=>$c) {
+            if ($rankVal<=$c) return $title;
         }
         return Arr::last($this->casualRankingPer);
     }
 
     private function getProfessionalTitle($rankVal)
     {
-        foreach($this->professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+        foreach ($this->professionalRankingPer as $title=>$point) {
+            if ($rankVal>=$point) return $title;
         }
         return Arr::last($this->professionalRankingPer);
     }

Braces +12 added lines, -4 removed lines

@@ -64,13 +64,17 @@ 
 
     public static function getColor($rankTitle)
     {
-        if(is_null($rankTitle)) return "";
+        if(is_null($rankTitle)) {
+            return "";
+        }
         return self::$casualRanking[$rankTitle];
     }
 
     public static function getProfessionalColor($rankTitle)
     {
-        if(is_null($rankTitle)) return self::$professionalRanking["None"];
+        if(is_null($rankTitle)) {
+            return self::$professionalRanking["None"];
+        }
         return self::$professionalRanking[$rankTitle];
     }
 
@@ -165,7 +169,9 @@ 
     private function getRankTitle($rankVal)
     {
         foreach($this->casualRankingPer as $title=>$c){
-            if($rankVal<=$c) return $title;
+            if($rankVal<=$c) {
+                return $title;
+            }
         }
         return Arr::last($this->casualRankingPer);
     }
@@ -173,7 +179,9 @@ 
     private function getProfessionalTitle($rankVal)
     {
         foreach($this->professionalRankingPer as $title=>$point) {
-            if($rankVal >= $point) return $title;
+            if($rankVal >= $point) {
+                return $title;
+            }
         }
         return Arr::last($this->professionalRankingPer);
     }