fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Use pointer receiver more offen

Browse source
This commit is contained in:
nemunaire 2021-11-22 15:35:07 +01:00
commit c7569b5e54
59 changed files with 688 additions and 672 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libfic/team_my.go
View file

@ -79,7 +79,7 @@ type myTeam struct {
Id int64 `json:"team_id"`
Name string `json:"name"`
Points int64 `json:"score"`
Members []Member `json:"members"`
Members []*Member `json:"members,omitempty"`
Exercices map[string]myTeamExercice `json:"exercices"`
}
@ -103,7 +103,6 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
if members, err := t.GetMembers(); err == nil {
ret.Members = members
}
}
// Fill exercices, only if the challenge is started
@ -130,16 +129,16 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
exercice.TotalTries = e.TriedCount()
exercice.Gain = int(float64(e.Gain) * e.Coefficient * GlobalScoreCoefficient)
} else {
solved, stime := t.HasSolved(e)
exercice.SolvedTime = &stime
stime := t.HasSolved(e)
exercice.SolvedTime = stime
if solved {
if stime != nil {
exercice.SolvedRank, _ = t.GetSolvedRank(e)
exercice.Finished = e.Finished
exercice.Tries, _ = t.CountTries(e)
} else {
exercice.Tries, stime = t.CountTries(e)
exercice.SolvedTime = &stime
exercice.SolvedTime = stime
if exercice.Tries > 0 {
exercice.SolveDist = t.LastTryDist(e)
}
@ -149,7 +148,7 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
exercice.SolvedTime = nil
}
if gain, err := e.EstimateGain(*t, solved); err == nil {
if gain, err := e.EstimateGain(t, stime != nil); err == nil {
exercice.Gain = int(gain * GlobalScoreCoefficient)
} else {
log.Println("ERROR during gain estimation:", err)