mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-03-13 22:49:51 -04:00
Scoring queues mostly working
This commit is contained in:
parent
aa282c3a35
commit
40c26bb395
3 changed files with 90 additions and 22 deletions
|
@ -105,9 +105,13 @@ module.exports = class HomeView extends View
|
|||
@wizardSprite?.destroy()
|
||||
|
||||
onSimulateButtonClick: (e) =>
|
||||
@alreadyPostedResults = false
|
||||
$.get "/queue/scoring", (data) =>
|
||||
console.log data
|
||||
levelName = data.sessions[0].levelID
|
||||
#TODO: Refactor. So much refactor.
|
||||
@taskData = data
|
||||
@teamSessionMap = @generateTeamSessionMap data
|
||||
world = {}
|
||||
god = new God()
|
||||
levelLoader = new LevelLoader(levelName, @supermodel, data.sessions[0].sessionID)
|
||||
|
@ -138,8 +142,63 @@ module.exports = class HomeView extends View
|
|||
Backbone.Mediator.subscribe 'god:new-world-created', @onWorldCreated, @
|
||||
|
||||
onWorldCreated: (data) ->
|
||||
console.log "GOAL STATES"
|
||||
console.log data
|
||||
return if @alreadyPostedResults
|
||||
taskResults = @translateGoalStatesIntoTaskResults data.goalStates
|
||||
console.log "Task Results"
|
||||
console.log taskResults
|
||||
$.ajax
|
||||
url: "/queue/scoring"
|
||||
data: taskResults
|
||||
type: 'PUT'
|
||||
success: (result) =>
|
||||
console.log "TASK REGISTRATION RESULT:#{JSON.stringify result}"
|
||||
error: (error) =>
|
||||
console.log "TASK REGISTRATION ERROR:#{JSON.stringify error}"
|
||||
complete: (result) =>
|
||||
@alreadyPostedResults = true
|
||||
|
||||
|
||||
translateGoalStatesIntoTaskResults: (goalStates) =>
|
||||
taskResults = {}
|
||||
taskResults =
|
||||
taskID: @taskData.taskID
|
||||
receiptHandle: @taskData.receiptHandle
|
||||
calculationTime: 500
|
||||
sessions: []
|
||||
|
||||
for session in @taskData.sessions
|
||||
sessionResult =
|
||||
sessionID: session.sessionID
|
||||
sessionChangedTime: session.sessionChangedTime
|
||||
metrics:
|
||||
rank: @calculateSessionRank session.sessionID, goalStates
|
||||
taskResults.sessions.push sessionResult
|
||||
taskResults
|
||||
|
||||
calculateSessionRank: (sessionID, goalStates) ->
|
||||
humansDestroyed = goalStates["destroy-humans"].status is "success"
|
||||
ogresDestroyed = goalStates["destroy-ogres"].status is "success"
|
||||
console.log "Humans destroyed:#{humansDestroyed}"
|
||||
console.log "Ogres destroyed:#{ogresDestroyed}"
|
||||
console.log "Team Session Map: #{JSON.stringify @teamSessionMap}"
|
||||
if humansDestroyed is ogresDestroyed
|
||||
return 0
|
||||
else if humansDestroyed and @teamSessionMap["ogres"] is sessionID
|
||||
return 0
|
||||
else if humansDestroyed and @teamSessionMap["ogres"] isnt sessionID
|
||||
return 1
|
||||
else if ogresDestroyed and @teamSessionMap["humans"] is sessionID
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
|
||||
|
||||
generateTeamSessionMap: (task) ->
|
||||
teamSessionMap = {}
|
||||
for session in @taskData.sessions
|
||||
teamSessionMap[session.team] = session.sessionID
|
||||
teamSessionMap
|
||||
|
||||
|
||||
|
||||
filterProgrammableComponents: (thangs, spellToSourceMap) =>
|
||||
|
|
|
@ -10,7 +10,7 @@ crypto = require 'crypto'
|
|||
|
||||
module.exports.queueClient = undefined
|
||||
|
||||
defaultMessageVisibilityTimeoutInSeconds = 20
|
||||
defaultMessageVisibilityTimeoutInSeconds = 500
|
||||
defaultMessageReceiptTimeout = 10
|
||||
|
||||
|
||||
|
@ -190,7 +190,7 @@ class MongoQueue extends events.EventEmitter
|
|||
conditions =
|
||||
queue: @queueName
|
||||
scheduledVisibilityTime:
|
||||
$lt: new Date()
|
||||
$lte: new Date()
|
||||
|
||||
options =
|
||||
sort: 'scheduledVisibilityTime'
|
||||
|
@ -214,7 +214,7 @@ class MongoQueue extends events.EventEmitter
|
|||
queue: @queueName
|
||||
receiptHandle: receiptHandle
|
||||
scheduledVisibilityTime:
|
||||
$lt: new Date()
|
||||
$gte: new Date()
|
||||
|
||||
@Message.findOneAndRemove conditions, {}, (err, data) =>
|
||||
if err? then @emit 'error',err,data else @emit 'delete',err,data
|
||||
|
@ -237,14 +237,19 @@ class MongoQueue extends events.EventEmitter
|
|||
queue: @queueName
|
||||
receiptHandle: receiptHandle
|
||||
scheduledVisibilityTime:
|
||||
$lt: new Date()
|
||||
$gte: new Date()
|
||||
|
||||
update =
|
||||
$set:
|
||||
scheduledVisibilityTime: @_constructDefaultVisibilityTimeoutDate secondsFromNow
|
||||
|
||||
@Message.findOneAndUpdate conditions, update, (err, data) =>
|
||||
if err? then @emit 'error',err,data else @emit 'update',err,data
|
||||
if err?
|
||||
log.error "There was a problem updating the message visibility timeout:#{err}"
|
||||
@emit 'error',err,data
|
||||
else
|
||||
@emit 'update',err,data
|
||||
log.info "The message visibility time was updated"
|
||||
|
||||
callback? err, data
|
||||
|
||||
|
|
|
@ -61,6 +61,7 @@ module.exports.dispatchTaskToConsumer = (req, res) ->
|
|||
if (not message?) or message.isEmpty() or taskQueueReceiveError?
|
||||
return errors.gatewayTimeoutError res, "No messages were receieved from the queue. Msg:#{taskQueueReceiveError}"
|
||||
|
||||
|
||||
messageBody = parseTaskQueueMessage req, res, message
|
||||
return errors.serverError res, "There was an error parsing the queue message" unless messageBody?
|
||||
|
||||
|
@ -74,6 +75,8 @@ module.exports.dispatchTaskToConsumer = (req, res) ->
|
|||
|
||||
setTaskObjectTaskLogID taskObject, taskLogObject._id
|
||||
|
||||
taskObject.receiptHandle = message.getReceiptHandle()
|
||||
|
||||
sendResponseObject req, res, taskObject
|
||||
|
||||
|
||||
|
@ -159,16 +162,18 @@ 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?
|
||||
|
||||
logTaskComputation clientResponseObject, taskLog, (loggingError) ->
|
||||
if loggingError?
|
||||
return errors.serverError res, "There as a problem logging the task computation: #{loggingError}"
|
||||
logTaskComputation clientResponseObject, taskLog, (loggingError) ->
|
||||
if loggingError?
|
||||
return errors.serverError res, "There as a problem logging the task computation: #{loggingError}"
|
||||
|
||||
updateScores clientResponseObject, (updatingScoresError, newScores) ->
|
||||
if updatingScoresError?
|
||||
return errors.serverError res, "There was an error updating the scores.#{updatingScoresError}"
|
||||
updateScores clientResponseObject, (updatingScoresError, newScores) ->
|
||||
if updatingScoresError?
|
||||
return errors.serverError res, "There was an error updating the scores.#{updatingScoresError}"
|
||||
|
||||
sendResponseObject req, res, {"message":"The scores were updated successfully!"}
|
||||
sendResponseObject req, res, {"message":"The scores were updated successfully!"}
|
||||
|
||||
|
||||
|
||||
|
@ -178,6 +183,7 @@ 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"
|
||||
|
@ -217,14 +223,12 @@ updateScoreInSession = (scoreObject,callback) ->
|
|||
|
||||
LevelSession.findOne sessionObjectQuery, (err, session) ->
|
||||
return callback err, null if err?
|
||||
|
||||
session.meanStrength = scoreObject.meanStrength
|
||||
session.standardDeviation = scoreObject.standardDeviation
|
||||
session.totalScore = scoreObject.meanStrength - 1.8 * scoreObject.standardDeviation
|
||||
|
||||
log.info "Saving session #{session._id}!"
|
||||
|
||||
session.save callback
|
||||
updateObject =
|
||||
meanStrength: scoreObject.meanStrength
|
||||
standardDeviation: scoreObject.standardDeviation
|
||||
totalScore: scoreObject.meanStrength - 1.8 * scoreObject.standardDeviation
|
||||
log.info "New total score for session #{scoreObject.id} is #{updateObject.totalScore}"
|
||||
LevelSession.update sessionObjectQuery, updateObject, callback
|
||||
|
||||
|
||||
putRankingFromMetricsIntoScoreObject = (taskObject,scoreObject) ->
|
||||
|
|
Loading…
Reference in a new issue