mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-04-27 14:33:59 -04:00
Simulation fixes
This commit is contained in:
Michael Schmatz
parent
c5655074e3
commit
d02d09ae36
3 changed files with 91 additions and 94 deletions
app/lib/simulator
server
|
|
@ -70,8 +70,9 @@ module.exports = class Simulator
|
|||
@sendResultsBackToServer taskResults
|
||||
|
||||
sendResultsBackToServer: (results) =>
|
||||
console.log "Sending result back to server!"
|
||||
$.ajax
|
||||
url: @taskURL
|
||||
url: "/queue/scoring"
|
||||
data: results
|
||||
type: "PUT"
|
||||
success: @handleTaskResultsTransferSuccess
|
||||
|
|
@ -104,7 +105,8 @@ module.exports = class Simulator
|
|||
for session in @task.getSessions()
|
||||
sessionResult =
|
||||
sessionID: session.sessionID
|
||||
sessionChangedTime: session.sessionChangedTime
|
||||
submitDate: session.submitDate
|
||||
creator: session.creator
|
||||
metrics:
|
||||
rank: @calculateSessionRank session.sessionID, simulationResults.goalStates, @task.generateTeamToSessionMap()
|
||||
|
||||
|
|
|
|||
|
|
@ -175,9 +175,6 @@ _.extend LevelSessionSchema.properties,
|
|||
title: 'Opponent User ID'
|
||||
description: 'The user ID of an opponent'
|
||||
type: ['object','string']
|
||||
codeSubmitDate: c.date
|
||||
title: 'Submitted'
|
||||
description: 'The date which the opponent submitted their session (used to check if the match can be replayed)'
|
||||
metrics:
|
||||
type: 'object'
|
||||
properties:
|
||||
|
|
|
|||
|
|
@ -25,40 +25,40 @@ connectToScoringQueue = ->
|
|||
log.info "Connected to scoring task queue!"
|
||||
|
||||
module.exports.createNewTask = (req, res) ->
|
||||
requestSessionID = getSessionIDFromRequest req
|
||||
requestSessionID = req.body.session
|
||||
if isUserAnonymous req then return errors.forbidden res, "You need to be logged in to be added to the leaderboard"
|
||||
return errors.badInput res, "The session ID is invalid" unless requestSessionID is "string"
|
||||
return errors.badInput res, "The session ID is invalid" unless typeof requestSessionID is "string"
|
||||
|
||||
fetchSubmittedSession requestSessionID, (err, sessionToScore) ->
|
||||
fetchSessionToSubmit requestSessionID, (err, sessionToSubmit) ->
|
||||
if err? then return errors.serverError res, "There was an error finding the given session."
|
||||
|
||||
updateSubmittedSession sessionToScore, (err, data) ->
|
||||
if err? then return errors.serverError res, "There was an error updating the session"
|
||||
updateSessionToSubmit sessionToSubmit, (err, data) ->
|
||||
if err? then return errors.serverError res, "There was an error updating the session"
|
||||
|
||||
fetchSessionsToRankAgainst (err, submittedSessions) ->
|
||||
if err? then return errors.serverError res, "There was an error fetching the sessions to rank against"
|
||||
fetchSessionsToRankAgainst (err, sessionsToRankAgainst) ->
|
||||
if err? then return errors.serverError res, "There was an error fetching the sessions to rank against"
|
||||
|
||||
taskPairs = generateTaskPairs(submittedSessions, sessionToScore)
|
||||
sendEachTaskPairToTheQueue taskPairs, (taskPairError) ->
|
||||
if taskPairError? then return errors.serverError res, "There was an error sending the task pairs to the queue"
|
||||
taskPairs = generateTaskPairs(sessionsToRankAgainst, sessionToSubmit)
|
||||
sendEachTaskPairToTheQueue taskPairs, (taskPairError) ->
|
||||
if taskPairError? then return errors.serverError res, "There was an error sending the task pairs to the queue"
|
||||
|
||||
sendResponseObject req, res, {"message":"All task pairs were succesfully sent to the queue"}
|
||||
sendResponseObject req, res, {"message":"All task pairs were succesfully sent to the queue"}
|
||||
|
||||
module.exports.dispatchTaskToConsumer = (req, res) ->
|
||||
if isUserAnonymous(req) then return errors.forbidden res, "You need to be logged in to simulate games"
|
||||
|
||||
scoringTaskQueue.receiveMessage (err, message) ->
|
||||
if err? or not messageIsInvalid(message) then return errors.gatewayTimeoutError res, "Queue Receive Error:#{err}"
|
||||
|
||||
if err? or messageIsInvalid(message) then return errors.gatewayTimeoutError res, "Queue Receive Error:#{err}"
|
||||
console.log "Received Message"
|
||||
messageBody = parseTaskQueueMessage req, res, message
|
||||
return unless messageBody?
|
||||
|
||||
constructTaskObject messageBody, (taskConstructionError, taskObject) ->
|
||||
if taskConstructionError? then return errors.serverError res, "There was an error constructing the scoring task"
|
||||
|
||||
console.log "Constructed task body"
|
||||
message.changeMessageVisibilityTimeout scoringTaskTimeoutInSeconds, (err) ->
|
||||
if err? then return errors.serverError res, "There was an error changing the message visibility timeout."
|
||||
|
||||
console.log "Changed visibility timeout"
|
||||
constructTaskLogObject getUserIDFromRequest(req),message.getReceiptHandle(), (taskLogError, taskLogObject) ->
|
||||
if taskLogError? then return errors.serverError res, "There was an error creating the task log object."
|
||||
|
||||
|
|
@ -69,11 +69,9 @@ module.exports.dispatchTaskToConsumer = (req, res) ->
|
|||
|
||||
module.exports.processTaskResult = (req, res) ->
|
||||
clientResponseObject = verifyClientResponse req.body, res
|
||||
|
||||
return unless clientResponseObject?
|
||||
|
||||
taskLogQuery = _id: clientResponseObject.taskID
|
||||
|
||||
TaskLog.findOne taskLogQuery, (err, taskLog) ->
|
||||
TaskLog.findOne {_id: clientResponseObject.taskID}, (err, taskLog) ->
|
||||
return errors.serverError res, "There was an error retrieiving the task log object" if err?
|
||||
|
||||
taskLogJSON = taskLog.toObject()
|
||||
|
|
@ -81,40 +79,75 @@ module.exports.processTaskResult = (req, res) ->
|
|||
return errors.badInput res, "That computational task has already been performed" if taskLogJSON.calculationTimeMS
|
||||
return handleTimedOutTask req, res, clientResponseObject if hasTaskTimedOut taskLogJSON.sentDate
|
||||
|
||||
destroyQueueMessage clientResponseObject.receiptHandle, (err) ->
|
||||
return errors.badInput res, "The queue message is already back in the queue, rejecting results." if err?
|
||||
scoringTaskQueue.deleteMessage clientResponseObject.receiptHandle, (err) ->
|
||||
if err? then return errors.badInput res, "The queue message is already back in the queue, rejecting results."
|
||||
|
||||
logTaskComputation clientResponseObject, taskLog, (loggingErr) ->
|
||||
return errors.serverError res, "There as a problem logging the task computation: #{loggingErr}" if loggingErr?
|
||||
logTaskComputation clientResponseObject, taskLog, (logErr) ->
|
||||
if logErr? then return errors.serverError res, "There as a problem logging the task computation: #{logErr}"
|
||||
|
||||
updateSessions clientResponseObject, (updateError, newScores) ->
|
||||
return errors.serverError res, "There was an error updating the scores.#{updateError}" if updateError?
|
||||
updateSessions clientResponseObject, (updateError, newScoreArray) ->
|
||||
if updateError? then return errors.serverError res, "There was an error updating the scores.#{updateError}"
|
||||
|
||||
newScoresObject = _.indexBy newScoreArray, 'id'
|
||||
|
||||
addMatchToSessions clientResponseObject, newScoresObject, (err, data) ->
|
||||
if err? then return errors.serverError res, "There was an error updating the sessions with the match! #{JSON.stringify err}"
|
||||
console.log "Sending response object"
|
||||
sendResponseObject req, res, {"message":"The scores were updated successfully!"}
|
||||
|
||||
|
||||
addMatchToSessions = (clientResponseObject, newScoreObject, callback) ->
|
||||
matchObject = {}
|
||||
matchObject.date = new Date()
|
||||
matchObject.opponents = {}
|
||||
for session in clientResponseObject.sessions
|
||||
sessionID = session.sessionID
|
||||
matchObject.opponents[sessionID] = {}
|
||||
matchObject.opponents[sessionID].sessionID = sessionID
|
||||
matchObject.opponents[sessionID].userID = session.creator
|
||||
matchObject.opponents[sessionID].metrics = {}
|
||||
matchObject.opponents[sessionID].metrics.rank = newScoreObject[sessionID].gameRanking
|
||||
|
||||
log.info "Match object computed, result: #{matchObject}"
|
||||
log.info "Writing match object to database..."
|
||||
#use bind with async to do the writes
|
||||
sessionIDs = _.pluck clientResponseObject.sessions, 'sessionID'
|
||||
async.each sessionIDs, updateMatchesInSession.bind(@,matchObject), (err) -> callback err, null
|
||||
|
||||
updateMatchesInSession = (matchObject, sessionID, callback) ->
|
||||
currentMatchObject = {}
|
||||
currentMatchObject.date = matchObject.date
|
||||
currentMatchObject.metrics = matchObject.opponents[sessionID].metrics
|
||||
opponentsClone = _.cloneDeep matchObject.opponents
|
||||
opponentsClone = _.omit opponentsClone, sessionID
|
||||
opponentsArray = _.toArray opponentsClone
|
||||
currentMatchObject.opponents = opponentsArray
|
||||
|
||||
sessionUpdateObject =
|
||||
$push: {matches: currentMatchObject}
|
||||
log.info "Updating session #{sessionID}"
|
||||
LevelSession.update {"_id":sessionID}, sessionUpdateObject, callback
|
||||
|
||||
sendResponseObject req, res, {"message":"The scores were updated successfully!"}
|
||||
|
||||
|
||||
messageIsInvalid = (message) -> (not message?) or message.isEmpty()
|
||||
|
||||
getSessionIDFromRequest = (req) -> req.body.session
|
||||
|
||||
sendEachTaskPairToTheQueue = (taskPairs, callback) -> async.each taskPairs, sendTaskPairToQueue, callback
|
||||
|
||||
fetchSubmittedSession = (submittedSessionID, callback) ->
|
||||
sessionQuery =
|
||||
_id: submittedSessionID
|
||||
LevelSession.findOne sessionQuery, (err, session) -> callback err, session?.toObject()
|
||||
fetchSessionToSubmit = (submittedSessionID, callback) ->
|
||||
LevelSession.findOne {_id: submittedSessionID}, (err, session) -> callback err, session?.toObject()
|
||||
|
||||
|
||||
updateSubmittedSession = (sessionToUpdate, callback) ->
|
||||
sessionQuery =
|
||||
_id: sessionToUpdate._id
|
||||
|
||||
updateSessionToSubmit = (sessionToUpdate, callback) ->
|
||||
sessionUpdateObject =
|
||||
submitted: true
|
||||
submittedCode: sessionToUpdate.code
|
||||
submitDate: new Date()
|
||||
|
||||
LevelSession.update sessionQuery, sessionUpdateObject, callback
|
||||
matches: []
|
||||
meanStrength: 25
|
||||
standardDeviation: 25/3
|
||||
totalScore: 10
|
||||
LevelSession.update {_id: sessionToUpdate._id}, sessionUpdateObject, callback
|
||||
|
||||
fetchSessionsToRankAgainst = (callback) ->
|
||||
submittedSessionsQuery =
|
||||
|
|
@ -122,30 +155,21 @@ fetchSessionsToRankAgainst = (callback) ->
|
|||
submitted: true
|
||||
submittedCode:
|
||||
$exists: true
|
||||
|
||||
LevelSession.find submittedSessionsQuery, callback
|
||||
|
||||
|
||||
generateTaskPairs = (submittedSessions, sessionToScore) ->
|
||||
taskPairs = []
|
||||
for session in submittedSessions
|
||||
session = session.toObject()
|
||||
|
||||
teams = ['ogres','humans']
|
||||
opposingTeams = _.pull teams, sessionToScore.team
|
||||
|
||||
if String(session._id) isnt String(sessionToScore._id) and session.team in opposingTeams
|
||||
console.log "Adding game to taskPairs!"
|
||||
taskPairs.push [req.body.session,String session._id]
|
||||
taskPairs
|
||||
taskPairs.push [sessionToScore._id,String session._id]
|
||||
return taskPairs
|
||||
|
||||
sendTaskPairToQueue = (taskPair, callback) ->
|
||||
taskObject =
|
||||
sessions: taskPair
|
||||
|
||||
scoringTaskQueue.sendMessage taskObject, 0, (err,data) ->
|
||||
callback? err,data
|
||||
|
||||
scoringTaskQueue.sendMessage {sessions: taskPair}, 0, (err,data) -> callback? err,data
|
||||
|
||||
getUserIDFromRequest = (req) -> if req.user? then return req.user._id else return null
|
||||
|
||||
|
|
@ -154,7 +178,6 @@ isUserAnonymous = (req) -> if req.user? then return req.user.get('anonymous') el
|
|||
parseTaskQueueMessage = (req, res, message) ->
|
||||
try
|
||||
if typeof message.getBody() is "object" then return message.getBody()
|
||||
|
||||
return messageBody = JSON.parse message.getBody()
|
||||
catch e
|
||||
sendResponseObject req, res, {"error":"There was an error parsing the task.Error: #{e}" }
|
||||
|
|
@ -176,19 +199,15 @@ constructTaskObject = (taskMessageBody, callback) ->
|
|||
"code": session.submittedCode
|
||||
"teamSpells": session.teamSpells ? {}
|
||||
"levelID": session.levelID
|
||||
"creator": session.creator
|
||||
|
||||
taskObject.sessions.push sessionInformation
|
||||
callback err, taskObject
|
||||
|
||||
|
||||
getSessionInformation = (sessionIDString, callback) ->
|
||||
sessionQuery
|
||||
_id:sessionIDString
|
||||
|
||||
LevelSession.findOne sessionQuery, (err, session) ->
|
||||
levelSessionFindOneError =
|
||||
"error":"There was an error retrieving the session."
|
||||
return callback err, levelSessionFindOneError if err?
|
||||
LevelSession.findOne {_id:sessionIDString}, (err, session) ->
|
||||
if err? then return callback err, {"error":"There was an error retrieving the session."}
|
||||
|
||||
sessionInformation = session.toObject()
|
||||
callback err, sessionInformation
|
||||
|
|
@ -200,7 +219,6 @@ constructTaskLogObject = (calculatorUserID, messageIdentifierString, callback) -
|
|||
"calculator":calculatorUserID
|
||||
"sentDate": Date.now()
|
||||
"messageIdentifierString":messageIdentifierString
|
||||
|
||||
taskLogObject.save callback
|
||||
|
||||
sendResponseObject = (req,res,object) ->
|
||||
|
|
@ -212,8 +230,6 @@ hasTaskTimedOut = (taskSentTimestamp) -> taskSentTimestamp + scoringTaskTimeoutI
|
|||
|
||||
handleTimedOutTask = (req, res, taskBody) -> errors.clientTimeout res, "The results weren't provided within the timeout"
|
||||
|
||||
destroyQueueMessage = (receiptHandle, callback) -> scoringTaskQueue.deleteMessage receiptHandle, callback
|
||||
|
||||
verifyClientResponse = (responseObject, res) ->
|
||||
unless typeof responseObject is "object"
|
||||
errors.badInput res, "The response to that query is required to be a JSON object."
|
||||
|
|
@ -231,62 +247,44 @@ updateSessions = (taskObject,callback) ->
|
|||
sessionIDs = _.pluck taskObject.sessions, 'sessionID'
|
||||
|
||||
async.map sessionIDs, retrieveOldSessionData, (err, oldScores) ->
|
||||
callback err, {"error": "There was an error retrieving the old scores"} if err?
|
||||
if err? then callback err, {"error": "There was an error retrieving the old scores"}
|
||||
|
||||
oldScoreArray = _.toArray putRankingFromMetricsIntoScoreObject taskObject, oldScores
|
||||
|
||||
newScoreArray = bayes.updatePlayerSkills oldScoreArray
|
||||
|
||||
saveNewScoresToDatabase newScoreArray, callback
|
||||
|
||||
|
||||
saveNewScoresToDatabase = (newScoreArray, callback) ->
|
||||
async.eachSeries newScoreArray, updateScoreInSession, (err) ->
|
||||
if err? then callback err, null else callback err, {"message":"All scores were saved successfully."}
|
||||
async.eachSeries newScoreArray, updateScoreInSession, (err) -> callback err,newScoreArray
|
||||
|
||||
|
||||
updateScoreInSession = (scoreObject,callback) ->
|
||||
sessionObjectQuery =
|
||||
"_id": scoreObject.id
|
||||
LevelSession.findOne {"_id": scoreObject.id}, (err, session) ->
|
||||
if err? then return callback err, null
|
||||
|
||||
LevelSession.findOne sessionObjectQuery, (err, session) ->
|
||||
return callback err, null if err?
|
||||
session = session.toObject()
|
||||
updateObject =
|
||||
meanStrength: scoreObject.meanStrength
|
||||
standardDeviation: scoreObject.standardDeviation
|
||||
totalScore: scoreObject.meanStrength - 1.8 * scoreObject.standardDeviation
|
||||
LevelSession.update {"_id": scoreObject.id}, updateObject, callback
|
||||
log.info "New total score for session #{scoreObject.id} is #{updateObject.totalScore}"
|
||||
LevelSession.update sessionObjectQuery, updateObject, callback
|
||||
|
||||
|
||||
putRankingFromMetricsIntoScoreObject = (taskObject,scoreObject) ->
|
||||
scoreObject = _.indexBy scoreObject, 'id'
|
||||
|
||||
for session in taskObject.sessions
|
||||
scoreObject[session.sessionID].gameRanking = session.metrics.rank
|
||||
|
||||
scoreObject
|
||||
scoreObject[session.sessionID].gameRanking = session.metrics.rank for session in taskObject.sessions
|
||||
return scoreObject
|
||||
|
||||
retrieveOldSessionData = (sessionID, callback) ->
|
||||
sessionQuery =
|
||||
"_id":sessionID
|
||||
|
||||
LevelSession.findOne sessionQuery, (err, session) ->
|
||||
LevelSession.findOne {"_id":sessionID}, (err, session) ->
|
||||
return callback err, {"error":"There was an error retrieving the session."} if err?
|
||||
|
||||
session = session.toObject()
|
||||
defaultScore = (25 - 1.8*(25/3))
|
||||
defaultStandardDeviation = 25/3
|
||||
|
||||
oldScoreObject =
|
||||
"standardDeviation":session.standardDeviation ? defaultStandardDeviation
|
||||
"standardDeviation":session.standardDeviation ? 25/3
|
||||
"meanStrength":session.meanStrength ? 25
|
||||
"totalScore":session.totalScore ? defaultScore
|
||||
"totalScore":session.totalScore ? (25 - 1.8*(25/3))
|
||||
"id": sessionID
|
||||
|
||||
callback err, oldScoreObject
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue