s464900/gonito
1
0
Fork 0
forked from filipg/gonito
Code Issues Pull Requests Projects Releases Wiki Activity

Consider only non-hidden submissions

Browse Source
This commit is contained in:
Filip Graliński 2018-11-13 16:15:02 +01:00
parent bc34520fdd
commit 484b98e699
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Handler/ShowChallenge.hs
View File

@ -44,6 +44,9 @@ import Data.Conduit.SmartSource
import Data.List (nub) import Data.List (nub)
import qualified Database.Esqueleto as E
import Database.Esqueleto ((^.))
getShowChallengeR :: Text -> Handler Html getShowChallengeR :: Text -> Handler Html
getShowChallengeR name = do getShowChallengeR name = do
app <- getYesod app <- getYesod
@ -240,12 +243,23 @@ doCreateSubmission userId challengeId mDescription mTags repoSpec chan = do
activeTests <- runDB $ selectList [TestChallenge ==. challengeId, TestActive ==. True] [] activeTests <- runDB $ selectList [TestChallenge ==. challengeId, TestActive ==. True] []
let (Entity mainTestId mainTest) = getMainTest activeTests let (Entity mainTestId mainTest) = getMainTest activeTests
bestResultSoFar <- runDB $ selectFirst [EvaluationTest ==. mainTestId,
EvaluationScore !=. Nothing] let orderDirection = case getMetricOrdering (testMetric mainTest) of
[ (case getMetricOrdering (testMetric mainTest) of TheHigherTheBetter -> E.desc
TheHigherTheBetter -> Desc TheLowerTheBetter -> E.asc
TheLowerTheBetter -> Asc) EvaluationScore ]
let bestScoreSoFar = join (evaluationScore <$> entityVal <$> bestResultSoFar) bestResultSoFar <- runDB $ E.select $ E.from $ \(evaluation, submission, variant, out) -> do
E.where_ (submission ^. SubmissionChallenge E.==. E.val challengeId
E.&&. submission ^. SubmissionIsHidden E.!=. E.val (Just True)
E.&&. variant ^. VariantSubmission E.==. submission ^. SubmissionId
E.&&. evaluation ^. EvaluationChecksum E.==. out ^. OutChecksum
E.&&. evaluation ^. EvaluationScore E.!=. E.val Nothing
E.&&. out ^. OutVariant E.==. variant ^. VariantId
E.&&. evaluation ^. EvaluationTest E.==. E.val mainTestId)
E.orderBy [orderDirection (evaluation ^. EvaluationScore)]
E.limit 1
return evaluation
let bestScoreSoFar = join (evaluationScore <$> entityVal <$> (listToMaybe bestResultSoFar))
case bestScoreSoFar of case bestScoreSoFar of
Just s -> msg chan ("best score so far is: " ++ (Data.Text.pack $ show s)) Just s -> msg chan ("best score so far is: " ++ (Data.Text.pack $ show s))