Skip to content

Custom scoring #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eropsergeev wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Custom scoring #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36383be
Support of virtual contests with upsolving
Feb 17, 2021
b17883c
Options for virtual deadlines in the config
Feb 17, 2021
902c838
Add custom scoring
Feb 19, 2021
63d95e0
Fix recompute formula
Feb 19, 2021
68cb520
Config added
Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions conf/local.cfg.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,63 @@ InternalName = example

-- DeadlinePenalty = 3/4

--|
--| Option "VirtualDeadlines"
--| Required: optional
--|
--| This option sets deadlines for all contestnts as virtual start time + VirtualDeadlines seconds.
--|

-- VirtualDeadlines = 600 -- 10 minutes

--|
--| Section "CustomScoring"
--|
--| Required: optional
--|
--| You want to make your own scoring system? Use this section!
--| Contestant's score will compute as function of fold of scores by each run in time order.
--|

-- CustomScoring {

--|
--| Option: "InitialValue"
--| Required: mandatory
--|
--| ELang expression specifying initial value of accumulator in fold.
--|

-- InitialValue = 0

--|
--| Option: "RecomputeFormula"
--| Required: mandatory
--|
--| ELang expression specifying formula for recomputing value by each run.
--| May contain variables:
--| *previousValue -- value before applying this formula
--| *runScore -- score of current run
--| *isOverdue -- True, if current run is overdue, False elses
--|

-- RecomputeFormula = Max(previousValue, runScore * If(isOverdue, 1, 3 / 4))

--|
--| Option: "FinalFormula"
--| Required: mandatory
--|
--| ELang expression specifying formula for recomput final score by each fold's result.
--| Must return number.
--| May contain variables:
--| *intermediateResult -- fold's result
--|


-- FinalFormula = intermediateResult

-- }

--|
--| Section "SetFixedDeadline"
--|
Expand Down
8 changes: 8 additions & 0 deletions src/EjStand/Models/Standing.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module EjStand.Models.Standing
, RunStatusType(..)
, FixedDeadline(..)
, ConditionalStyle(..)
, CustomScoring(..)
, ColumnVariant(..)
, OrderType(..)
, FractionDisplayStyle(..)
Expand Down Expand Up @@ -122,6 +123,11 @@ data FractionDisplayStyle = DisplayAsFraction
| DisplayAsDecimal !Int
deriving (Show)

data CustomScoring = CustomScoring { initialValue :: !ELang.ASTElement
, recomputeFormula :: !ELang.ASTElement
, finalFormula :: !ELang.ASTElement
}

data StandingConfig = StandingConfig { standingName :: !Text
, standingContests :: !(Set Integer)
, internalName :: !Text
Expand All @@ -144,6 +150,8 @@ data StandingConfig = StandingConfig { standingName :: !Text
, showLanguages :: !Bool
, showProblemStatistics :: !Bool
, fractionDisplayStyle :: !FractionDisplayStyle
, virtualDeadlines :: !(Maybe Integer)
, customScoring :: !(Maybe CustomScoring)
}

data RunStatusType = Ignore | Mistake | Rejected | Processing | Pending | Success | Disqualified | Error
Expand Down
12 changes: 12 additions & 0 deletions src/EjStand/Parsers/Configuration.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,14 @@ buildContestNamePattern = evalState $ do
!_ <- ensureEmptyState
return (regex, replacer)

buildCustomScoring :: Configuration -> CustomScoring
buildCustomScoring = evalState $ do
initialValue <- takeMandatoryValue |> toTextValue |> toELangAST $ "InitialValue"
recomputeFormula <- takeMandatoryValue |> toTextValue |> toELangAST $ "RecomputeFormula"
finalFormula <- takeMandatoryValue |> toTextValue |> toELangAST $ "FinalFormula"
!_ <- ensureEmptyState
return $ CustomScoring initialValue recomputeFormula finalFormula

buildNestedOptions :: (Configuration -> a) -> Text -> TraversingState IO [a]
buildNestedOptions builder optionName = do
nested <- takeValuesByKey ||> toNestedConfig $ optionName
Expand Down Expand Up @@ -369,6 +377,8 @@ buildStandingConfig path = do
showProblemStatistics <- takeUniqueValue ||> toTextValue ||> toBool .> fromMaybe False $ "ShowProblemStatistics"
fractionDisplayStyle <-
takeUniqueValue ||> toTextValue ||> toFractionDisplayStyle .> fromMaybe DisplayAsFraction $ "DecimalPrecision"
virtualDeadlines <- takeUniqueValue ||> toTextValue ||> toInteger $ "VirtualDeadlines"
customScoring <- takeUniqueValue ||> toNestedConfig |.> buildCustomScoring $ "CustomScoring"
!_ <- ensureEmptyState
return $ StandingConfig { standingName = standingName
, standingContests = standingContests
Expand All @@ -392,6 +402,8 @@ buildStandingConfig path = do
, showLanguages = showLanguages
, showProblemStatistics = showProblemStatistics
, fractionDisplayStyle = fractionDisplayStyle
, virtualDeadlines = virtualDeadlines
, customScoring = customScoring
}

parseStandingConfig :: FilePath -> IO StandingConfig
Expand Down
44 changes: 40 additions & 4 deletions src/EjStand/StandingBuilder.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE OverloadedStrings #-}
module EjStand.StandingBuilder
( prepareStandingSource
, buildStanding
Expand All @@ -24,7 +25,9 @@ import qualified Data.Set as Set
import Data.Text ( Text
, unpack
)
import Data.Time ( UTCTime )
import Data.Time ( UTCTime
, addUTCTime
)
import EjStand.Internals.Core ( fromIdentifiableList )
import EjStand.Models.Base
import EjStand.Models.Standing
Expand All @@ -33,6 +36,7 @@ import EjStand.Parsers.EjudgeOptions ( updateStandingSourceWithProble
import EjStand.Web.HtmlElements ( getColumnByVariant
, getColumnByVariantWithStyles
)
import qualified EjStand.ELang as ELang
import Safe ( headMay
, lastMay
, minimumMay
Expand All @@ -57,12 +61,16 @@ isAppliableDeadlineOption Problem {..} Contestant {..} FixedDeadline {..}
| otherwise = False

calculateDeadline :: StandingConfig -> StandingSource -> Problem -> Contestant -> Maybe UTCTime
calculateDeadline StandingConfig {..} StandingSource {..} prob@Problem {..} user@Contestant {..} = if enableDeadlines
calculateDeadline StandingConfig {..} src@StandingSource {..} prob@Problem {..} user@Contestant {..} = if enableDeadlines
then
let nextContest = snd <$> Map.lookupGT problemContest contests
defaultDeadline = nextContest >>= contestStartTime
customDeadline = fmap deadline $ lastMay $ filter (isAppliableDeadlineOption prob user) fixedDeadlines
in headMay $ catMaybes [customDeadline, defaultDeadline]
virtualDeadline = do
time <- virtualDeadlines
virtualStart <- getVirtualStart src prob user
return $ addUTCTime (fromInteger time) virtualStart
in headMay $ catMaybes [virtualDeadline, customDeadline, defaultDeadline]
else Nothing

-- Standing building
Expand Down Expand Up @@ -125,6 +133,22 @@ applicateRun cfg prob cell@StandingCell {..} runT@(Run {..}, _)
| getRunStatusType runStatus == Disqualified = (setCellMainRunForce cfg prob runT cell) { cellScore = 0 }
| otherwise = setCellMainRunMaybe cfg prob runT cell

applicateRunWithCustomScoring :: StandingConfig -> Problem -> (StandingCell, Maybe ELang.Value) -> (Run, Bool) -> (StandingCell, Maybe ELang.Value)
applicateRunWithCustomScoring cfg@StandingConfig {..} prob state@(cell@StandingCell {..}, intermediateResult) runT@(Run {..}, overdue)
| getRunStatusType runStatus == Ignore = state
| cellType == Error = state
| getRunStatusType runStatus == Error = (setCellMainRunForce cfg prob runT cell, Nothing)
| cellType == Disqualified = state
| getRunStatusType runStatus == Disqualified = (setCellMainRunForce cfg prob runT cell, Nothing)
| otherwise = case fromJust customScoring of
CustomScoring{..} -> case
ELang.evaluate recomputeFormula [ ELang.VariableBinding "previousValue" (return (fromJust intermediateResult))
, ELang.VariableBinding "runScore" (return (ELang.ValueRational (fromMaybe 0 runScore)))
, ELang.VariableBinding "isOverdue" (return (ELang.ValueBool overdue))
] of
Left _ -> (cell { cellType = Error }, Nothing)
Right val -> (setCellMainRunForce cfg prob runT cell, Just val)

getVirtualStart :: StandingSource -> Problem -> Contestant -> Maybe UTCTime
getVirtualStart StandingSource {..} Problem {..} Contestant {..} = minimumMay $ runTime <$> filter
((== VS) . runStatus)
Expand All @@ -136,7 +160,19 @@ buildCell cfg@StandingConfig {..} src@StandingSource {..} prob@Problem {..} user
deadline = calculateDeadline cfg src prob user
startCell = defaultCell $ contests ! problemContest
virtualStart = if showSuccessTime then getVirtualStart src prob user else Nothing
cell = foldl (applicateRun cfg prob) startCell $ applyRunDeadline deadline <$> runsList
cell = case customScoring of
Nothing -> foldl (applicateRun cfg prob) startCell $ applyRunDeadline deadline <$> runsList
Just CustomScoring {..} -> let
startValue = case ELang.evaluate initialValue [] of
Left _ -> Nothing
Right val -> Just val
in case foldl (applicateRunWithCustomScoring cfg prob) (startCell, startValue) $ applyRunDeadline deadline <$> runsList of
(cell, Nothing) -> cell { cellType = Error }
(cell, Just value) -> case ELang.evaluate finalFormula [ELang.VariableBinding "intermediateResult" (return value)] of
Left _ -> cell { cellType = Error }
Right finalValue -> case ELang.fromValue finalValue :: Maybe Rational of
Nothing -> cell { cellType = Error }
Just score -> cell { cellScore = score }
in cell { cellStartTime = fromMaybe (cellStartTime cell) virtualStart }

calculateCellStats :: StandingCell -> StandingRowStats
Expand Down