wuhanstudio
/
com2014-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix] error on empty my_model.py

This commit is contained in:
Wu Han 2021-01-10 16:58:06 +00:00
parent 36068c74de
commit c42fb0ecea
2 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
resources/js/socket_script.js
View File

@ -107,10 +107,11 @@ socket.on('info', (msg) => {
socket.on('error', (msg) => { socket.on('error', (msg) => {
console.log(msg); console.log(msg);
Snackbar.show({ Snackbar.show({
text: msg, text: 'Error: ' + msg,
pos: 'bottom-right', pos: 'bottom-right',
duration: 5000, duration: 8000,
backgroundColor: '#E64A19' backgroundColor: '#E64A19',
showAction: false
}); });
}); });
@ -147,40 +148,58 @@ function update_your_res(tsp_file, fitness) {
// Update personal result // Update personal result
socket.on('result', (res) => { socket.on('result', (res) => {
$("#resultModal").modal('show');
res = JSON.parse(res); res = JSON.parse(res);
$('#submission_info').show();
res.forEach(e => { $("#ulysses16_your").text('Error');
if(e.name === "ulysses16.txt") { $("#att48_your").text('Error');
my_res.ulysses16.fitness = e.fitness $("#st70_your").text('Error');
my_res.ulysses16.solution = e.solution $("#a280_your").text('Error');
update_your_res("ulysses16", e.fitness) $("#pcb442_your").text('Error');
} $("#dsj1000_your").text('Error');
if(e.name === "att48.txt") {
my_res.att48.fitness = e.fitness $("#ulysses16_your").removeClass('blink_me');
my_res.att48.solution = e.solution $("#att48_your").removeClass('blink_me');
update_your_res("att48", e.fitness) $("#st70_your").removeClass('blink_me');
} $("#a280_your").removeClass('blink_me');
if(e.name === "st70.txt") { $("#pcb442_your").removeClass('blink_me');
my_res.st70.fitness = e.fitness $("#dsj1000_your").removeClass('blink_me');
my_res.st70.solution = e.solution
update_your_res("st70", e.fitness) if (res.length !== 0) {
}
if(e.name === "a280.txt") { $("#resultModal").modal('show');
my_res.a280.fitness = e.fitness $('#submission_info').show();
my_res.a280.solution = e.solution
update_your_res("a280", e.fitness) res.forEach(e => {
} if(e.name === "ulysses16.txt") {
if(e.name === "pcb442.txt") { my_res.ulysses16.fitness = e.fitness
my_res.pcb442.fitness = e.fitness my_res.ulysses16.solution = e.solution
my_res.pcb442.solution = e.solution update_your_res("ulysses16", e.fitness)
update_your_res("pcb442", e.fitness) }
} if(e.name === "att48.txt") {
if(e.name === "dsj1000.txt") { my_res.att48.fitness = e.fitness
my_res.dsj1000.fitness = e.fitness my_res.att48.solution = e.solution
my_res.dsj1000.solution = e.solution update_your_res("att48", e.fitness)
update_your_res("dsj1000", e.fitness) }
} if(e.name === "st70.txt") {
}); my_res.st70.fitness = e.fitness
my_res.st70.solution = e.solution
update_your_res("st70", e.fitness)
}
if(e.name === "a280.txt") {
my_res.a280.fitness = e.fitness
my_res.a280.solution = e.solution
update_your_res("a280", e.fitness)
}
if(e.name === "pcb442.txt") {
my_res.pcb442.fitness = e.fitness
my_res.pcb442.solution = e.solution
update_your_res("pcb442", e.fitness)
}
if(e.name === "dsj1000.txt") {
my_res.dsj1000.fitness = e.fitness
my_res.dsj1000.solution = e.solution
update_your_res("dsj1000", e.fitness)
}
});
}
}); });

7
server.js
View File

@ -109,9 +109,9 @@ var update_leaderboard = (obj) => {
var update_submission = (socket, sessionID) => { var update_submission = (socket, sessionID) => {
var output_dir = current_path.toString() + '/output/' + sessionID + '/' var output_dir = current_path.toString() + '/output/' + sessionID + '/'
console.log(output_dir) console.log(output_dir)
var res = []
if (output_dir.length != 0) if (output_dir.length != 0)
{ {
var res = []
socket.emit('info', 'Got output') socket.emit('info', 'Got output')
// Read output dir // Read output dir
@ -170,8 +170,11 @@ var update_submission = (socket, sessionID) => {
res.push(obj) res.push(obj)
} }
}) })
socket.emit('result', JSON.stringify(res))
}) })
if (res.length === 0) {
socket.emit('error', 'Please check my_model.py')
}
socket.emit('result', JSON.stringify(res))
} }
else { else {
console.log('no result') console.log('no result')