Cleaned up structs for Sp2018Ece408. Implemented ranking for Sp2018Ece408 including listing rank for each team and highlighting the current users team.

Author: aschuh703

cmd/ranking.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"fmt"
+	//"fmt"
 	"os"
 	"sort"
 	"strconv"
@@ -13,6 +13,9 @@ import (
 	"github.com/rai-project/model"
 	"github.com/spf13/cobra"
 	upper "upper.io/db.v3"
+  "github.com/rai-project/auth/provider"
+  "github.com/pkg/errors"
+  "github.com/rai-project/client"
 )
 
 var numResults int
@@ -48,14 +51,14 @@ var rankingCmd = &cobra.Command{
 		}
 		defer db.Close()
 
-		col, err := model.NewFa2017Ece408JobCollection(db)
+		col, err := model.NewSp2018Ece408JobCollection(db)
 		if err != nil {
 			return err
 		}
 		defer col.Close()
 
 		// Get submissions
-		var jobs model.Fa2017Ece408Jobs
+		var jobs model.Sp2018Ece408Jobs
 		// cond := upper.Or(
 		// 	upper.Cond{
 		// 		"model":       "ece408-high",
@@ -70,17 +73,16 @@ var rankingCmd = &cobra.Command{
 		condInferencesExist := upper.Cond{"inferences.0 $exists": "true"}
 		cond := upper.And(
 			condInferencesExist,
-			upper.Cond{"is_submission": true},
+			upper.Cond{
+			  "is_submission": true,
+			  "inferences.correctness": 0.8451,},
 		)
 
 		err = col.Find(cond, 0, 0, &jobs)
 		if err != nil {
 			return err
 		}
 
-		// keep only jobs with correct inferences
-		jobs = model.FilterCorrectInferences(jobs)
-
 		// keep only jobs with non-zero runtimes
 		jobs = model.FilterNonZeroTimes(jobs)
 
@@ -96,20 +98,51 @@ var rankingCmd = &cobra.Command{
 		}
 		numResults = min(numResults, maxResults)
 		numResults = min(numResults, len(jobs))
-		jobs = jobs[0:numResults]
+		//jobs = jobs[0:numResults]
 
-		// Anonymize
-		// for i, j := range jobs {
-		// 	jobs[i] = j.Anonymize()
-		// }
-		for _, j := range jobs {
-			fmt.Println(j)
-		}
+		//for _, j := range jobs {
+		//	fmt.Println(j)
+		//}
+
+		// Get current user details
+    prof, err := provider.New()
+    if err != nil {
+      return err
+    }
 
+    ok, err := prof.Verify()
+    if err != nil {
+      return err
+    }
+    if !ok {
+      return errors.Errorf("cannot authenticate using the credentials in %v", prof.Options().ProfilePath)
+    }
+
+    tname, err := client.ReturnTeamName(prof.Info().Username)
+
+    // Create table of ranking
 		table := tablewriter.NewWriter(os.Stdout)
-		table.SetHeader([]string{"Anonymized Team", "Team's Fastest Conv (ms)"})
+		table.SetHeader([]string{"You","Rank", "Anonymized Team", "Fastest Conv (ms)"})
+
+		var x int64
+		var currentRank int64
+		var currentMinOpRunTime float64
+		x=1
+		currentRank = 1
+		currentMinOpRunTime = 0
+
 		for _, j := range jobs {
-			table.Append([]string{j.Teamname, strconv.FormatFloat(float64(j.MinOpRuntime())/float64(time.Millisecond), 'f', -1, 64)})
+		  if currentMinOpRunTime != float64(j.MinOpRuntime())/float64(time.Millisecond) {
+        currentMinOpRunTime = float64(j.MinOpRuntime()) / float64(time.Millisecond)
+        currentRank = x
+      }
+
+		  if tname == j.Teamname {
+        table.Append([]string{tname + " -->", strconv.FormatInt(currentRank, 10), j.Anonymize().Teamname, strconv.FormatFloat(currentMinOpRunTime, 'f', 3, 64)})
+      } else {
+        table.Append([]string{"", strconv.FormatInt(currentRank, 10), j.Anonymize().Teamname, strconv.FormatFloat(currentMinOpRunTime, 'f', 3, 64)})
+        x++
+      }
 		}
 
 		table.Render()

cmd/submitted.go

@@ -42,13 +42,13 @@ var submittedCmd = &cobra.Command{
     }
     defer db.Close()
 
-    col, err := model.NewFa2017Ece408JobCollection(db)
+    col, err := model.NewSp2018Ece408JobCollection(db)
     if err != nil {
       return err
     }
     defer col.Close()
 
-    var jobs model.Fa2017Ece408Jobs
+    var jobs model.Sp2018Ece408Jobs
 
     condInferencesExist := upper.Cond{"inferences.0 $exists": "true"}
     cond := upper.And(