p71924506
/
hoj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复HDU,POJ时间，内存记录错误

This commit is contained in:
Himit_ZH 2021-07-03 22:24:55 +08:00
parent 43776cbf44
commit 112320d424
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hoj-springboot/JudgeServer/src/main/java/top/hcode/hoj/remoteJudge/task/Impl/HduJudge.java
View File

@ -85,11 +85,11 @@ public class HduJudge implements RemoteJudgeStrategy {
HttpResponse response = request.execute(); HttpResponse response = request.execute();
// 1提交时间 2结果 3执行时间 4执行空间 5代码长度 // 1提交时间 2结果 3执行时间 4执行空间 5代码长度
// 一般情况下 代码长度和提交时间不需要，想要也行，自行添加 // 一般情况下 代码长度和提交时间不需要，想要也行，自行添加
Pattern pattern = Pattern.compile(">" + submitId + "</td><td>([\\s\\S]*?)</td><td>([\\s\\S]*?)</td><td>[\\s\\S]*?</td><td>(\\d*?)MS</td><td>(\\d*?)K</td><td>(\\d*?)B</td>"); Pattern pattern = Pattern.compile(">" + submitId + "</td><td>[\\s\\S]*?</td><td>([\\s\\S]*?)</td><td>[\\s\\S]*?</td><td>(\\d*?)MS</td><td>(\\d*?)K</td>");
Matcher matcher = pattern.matcher(response.body()); Matcher matcher = pattern.matcher(response.body());
// 找到时 // 找到时
Validate.isTrue(matcher.find()); Validate.isTrue(matcher.find());
String rawStatus = matcher.group(2).replaceAll("<[\\s\\S]*?>", "").trim(); String rawStatus = matcher.group(1).replaceAll("<[\\s\\S]*?>", "").trim();
Constants.Judge statusType = statusTypeMap.get(rawStatus); Constants.Judge statusType = statusTypeMap.get(rawStatus);
if (statusType == Constants.Judge.STATUS_PENDING) { if (statusType == Constants.Judge.STATUS_PENDING) {
return MapUtil.builder(new HashMap<String, Object>()) return MapUtil.builder(new HashMap<String, Object>())
@ -99,10 +99,11 @@ public class HduJudge implements RemoteJudgeStrategy {
Map<String, Object> result = MapUtil.builder(new HashMap<String, Object>()) Map<String, Object> result = MapUtil.builder(new HashMap<String, Object>())
.put("status", statusType.getStatus()).build(); .put("status", statusType.getStatus()).build();
// 获取其他信息 // 获取其他信息
String executionTime = matcher.group(3); String executionTime = matcher.group(2);
result.put("time", Integer.parseInt(executionTime)); result.put("time", Integer.parseInt(executionTime));
String executionMemory = matcher.group(4); String executionMemory = matcher.group(3);
result.put("memory", Integer.parseInt(executionMemory)); result.put("memory", Integer.parseInt(executionMemory));
// 如果CE了，则还需要获得错误信息 // 如果CE了，则还需要获得错误信息
if (statusType == Constants.Judge.STATUS_COMPILE_ERROR) { if (statusType == Constants.Judge.STATUS_COMPILE_ERROR) {
request.setUrl(HOST + String.format(ERROR_URL, submitId)); request.setUrl(HOST + String.format(ERROR_URL, submitId));

6
hoj-springboot/JudgeServer/src/main/java/top/hcode/hoj/remoteJudge/task/Impl/POJJudge.java
View File

@ -105,10 +105,10 @@ public class POJJudge implements RemoteJudgeStrategy {
result.put("CEInfo", HtmlUtil.unescape(compilationErrorInfo)); result.put("CEInfo", HtmlUtil.unescape(compilationErrorInfo));
} else { } else {
// 如果不是CE,获取其他信息 // 如果不是CE,获取其他信息
String executionTime = ReUtil.get("<b>Memory:</b> ([-\\d]+)", response.body(), 1); String executionMemory = ReUtil.get("<b>Memory:</b> ([-\\d]+)", response.body(), 1);
result.put("time", executionTime == null ? null : Integer.parseInt(executionTime));
String executionMemory = ReUtil.get("<b>Time:</b> ([-\\d]+)", response.body(), 1);
result.put("memory", executionMemory == null ? null : Integer.parseInt(executionMemory)); result.put("memory", executionMemory == null ? null : Integer.parseInt(executionMemory));
String executionTime = ReUtil.get("<b>Time:</b> ([-\\d]+)", response.body(), 1);
result.put("time", executionTime == null ? null : Integer.parseInt(executionTime));
} }
return result; return result;
} }