子任务依赖现在会以比例限制得分

Author: iotang

assignmentthread.cpp

@@ -25,6 +25,7 @@
  **/
 
 #include "globaltype.h"
+#include "subtaskdependencelib.h"
 #include "assignmentthread.h"
 
 #include <utility>
@@ -382,7 +383,7 @@ void AssignmentThread::run()
 		memoryUsed.append(QList<int>());
 		score.append(QList<int>());
 		result.append(QList<ResultState>());
-		overallStatus.append(2);
+		overallStatus.append(mxDependValue);
 		message.append(QStringList());
 		inputFiles.append(QStringList());
 		testCaseScore.append(task->getTestCase(i)->getFullScore());
@@ -413,7 +414,7 @@ void AssignmentThread::assign()
 	}
 
 	TestCase *curTestCase = task->getTestCase(curTestCaseIndex);
-	bool beingSkipped = false;
+	bool isSkipped = 0;
 
 	if (curSingleCaseIndex == curTestCase->getInputFiles().size())
 	{
@@ -438,26 +439,32 @@ void AssignmentThread::assign()
 		curTestCase = task->getTestCase(curTestCaseIndex);
 		const QList<int> &dependenceSubtask(curTestCase->getDependenceSubtask());
 
+		overallStatus[curTestCaseIndex] = mxDependValue;
+
 		for (int i = 0; i != dependenceSubtask.size(); ++i)
 		{
 			int status = overallStatus[dependenceSubtask[i] - 1];
-			emit singleSubtaskDependenceFinished(curTestCaseIndex, i, status);
+			emit singleSubtaskDependenceFinished(curTestCaseIndex, dependenceSubtask[i], status);
+
+			if (status < 0) isSkipped = 1;
 
-			if (status <= 0)beingSkipped = true;
+			overallStatus[curTestCaseIndex] = qMin(overallStatus[curTestCaseIndex], status);
 		}
 
 		if (! dependenceSubtask.empty())
-			score[curTestCaseIndex].push_back(-1 - beingSkipped);
+			score[curTestCaseIndex].push_back(overallStatus[curTestCaseIndex]);
 	}
 
 	totalSingleCase ++;
 	curTestCase = task->getTestCase(curTestCaseIndex);
 	inputFiles[curTestCaseIndex][curSingleCaseIndex]
 	   = QFileInfo(curTestCase->getInputFiles().at(curSingleCaseIndex)).fileName();
 
-	if (overallStatus[curTestCaseIndex] <= 0 || beingSkipped)
+	testCaseScore[curTestCaseIndex] = qMin(testCaseScore[curTestCaseIndex], statusToScore(overallStatus[curTestCaseIndex], curTestCase->getFullScore()));
+
+	if (overallStatus[curTestCaseIndex] < 0 || isSkipped)
 	{
-		overallStatus[curTestCaseIndex] = 0;
+		overallStatus[curTestCaseIndex] = -1;
 		taskSkipped(qMakePair(curTestCaseIndex, curSingleCaseIndex++));
 		return;
 	}
@@ -573,7 +580,7 @@ void AssignmentThread::threadFinished()
 		memoryUsed[cur.first][cur.second] = thread->getMemoryUsed();
 		score[cur.first][cur.second] = thread->getScore();
 		result[cur.first][cur.second] = thread->getResult();
-		overallStatus[cur.first] = qMin(overallStatus[cur.first], stateToStatus(thread->getResult()));
+		overallStatus[cur.first] = qMin(overallStatus[cur.first], stateToStatus(thread->getResult(), thread->getScore(), thread->getFullScore()));
 		message[cur.first][cur.second] = thread->getMessage();
 		running.remove(thread);
 		countFinished ++;
@@ -584,6 +591,9 @@ void AssignmentThread::threadFinished()
 		{
 			for (int i = 0; i < cur.second; i++)
 				nowScore = qMin(nowScore, score[cur.first][i]);
+
+			if (!task->getTestCase(cur.first)->getDependenceSubtask().empty())
+				nowScore = qMin(nowScore, statusToScore(overallStatus[curTestCaseIndex], task->getTestCase(cur.first)->getFullScore()));
 		}
 
 		emit singleCaseFinished(task->getTestCase(cur.first)->getTimeLimit(),

detaildialog.cpp

@@ -31,6 +31,7 @@
 #include "contest.h"
 #include "contestant.h"
 #include "globaltype.h"
+#include "subtaskdependencelib.h"
 #include "settings.h"
 #include "judgingdialog.h"
 #include <QMessageBox>
@@ -150,7 +151,7 @@ void DetailDialog::refreshViewer(Contest *_contest, Contestant *_contestant)
 						            .arg(inputFiles[j].size()).arg(j + 1);
 					else
 						htmlCode += QString(R"(<td nowrap="nowrap" rowspan="%1" align="center" valign="middle">#%2<br>%3:%4</td>)")
-						            .arg(inputFiles[j].size()).arg(j + 1).arg(tr("Subtask Dependence Status")).arg(score[j].back() == -1 ? tr("Success") : tr("Failed"));
+						            .arg(inputFiles[j].size()).arg(j + 1).arg(tr("Subtask Dependence Status")).arg(statusRankingText(score[j].back()));
 				}
 
 				htmlCode += QString(R"(<td nowrap="nowrap" align="center" valign="middle">%1</td>)").arg(inputFiles[j][k]);
@@ -199,10 +200,25 @@ void DetailDialog::refreshViewer(Contest *_contest, Contestant *_contestant)
 					for (int t = 0; t < inputFiles[j].size(); t ++)
 						if (score[j][t] < minv) minv = score[j][t];
 
-					QString bgColor = "rgb(255, 192, 192)";
+					int tempStatus = mxDependValue + 1;
 
-					if (minv >= maxv) bgColor = "rgb(192, 255, 192)";
-					else if (minv > 0) bgColor = "rgb(192, 255, 255)";
+					if (!testCases[j]->getDependenceSubtask().empty())
+					{
+						tempStatus = score[j].back();
+						minv = qMin(minv, statusToScore(score[j].back(), maxv));
+					}
+
+					QString bgColor = "rgb(192, 255, 192)";
+
+					for (int t = 0; t < inputFiles[j].size(); t ++)
+						if (result[j][t] != CorrectAnswer)bgColor = "rgb(192, 255, 255)";
+
+					if (tempStatus < mxDependValue)bgColor = "rgb(192, 255, 255)";
+
+					for (int t = 0; t < inputFiles[j].size(); t ++)
+						if (result[j][t] != CorrectAnswer && result[j][t] != PartlyCorrect)bgColor = "rgb(255, 192, 192)";
+
+					if (tempStatus < 0)bgColor = "rgb(255, 192, 192)";
 
 					htmlCode += QString(R"(<td rowspan="%1" align="center" valign="middle" style="background-color: %2;"><a style="font-weight: bold; font-size: large;">%3</a> / %4</td>)").arg(inputFiles[j].size()).arg(bgColor).arg(minv).arg(maxv);
 				}

exportutil.cpp

@@ -30,6 +30,7 @@
 #include "testcase.h"
 #include "contestant.h"
 #include "globaltype.h"
+#include "subtaskdependencelib.h"
 #include "settings.h"
 #include "visualsettings.h"
 #include <algorithm>
@@ -140,7 +141,7 @@ auto ExportUtil::getContestantHtmlCode(Contest *contest, Contestant *contestant,
 						            .arg(inputFiles[j].size()).arg(j + 1);
 					else
 						htmlCode += QString(R"(<td rowspan="%1" style="border-style: none solid solid none; border-width: 1px 3px; border-color: #ccc;">#%2<br>%3:%4</td>)")
-						            .arg(inputFiles[j].size()).arg(j + 1).arg(tr("Subtask Dependence Status")).arg(score[j].back() == -1 ? tr("Success") : tr("Failed"));
+						            .arg(inputFiles[j].size()).arg(j + 1).arg(tr("Subtask Dependence Status")).arg(statusRankingText(score[j].back()));
 				}
 
 				htmlCode += QString("<td style=\"border-style: none solid solid none; border-width: 1px 3px; border-color: #ccc;\">%1</td>").arg(inputFiles[j][k]);
@@ -470,7 +471,7 @@ auto ExportUtil::getSmallerContestantHtmlCode(Contest *contest, Contestant *cont
 						            .arg(inputFiles[j].size()).arg(j + 1);
 					else
 						htmlCode += QString("<td rowspan=\"%1\">#%2<br>%3:%4</td>")
-						            .arg(inputFiles[j].size()).arg(j + 1).arg(tr("Subtask Dependence Status")).arg(score[j].back() == -1 ? tr("Success") : tr("Failed"));
+						            .arg(inputFiles[j].size()).arg(j + 1).arg(tr("Subtask Dependence Status")).arg(statusRankingText(score[j].back()));
 				}
 
 				htmlCode += QString("<td>%1</td>").arg(inputFiles[j][k]);

globaltype.h

@@ -38,15 +38,4 @@ enum ResultState { CorrectAnswer, WrongAnswer, PartlyCorrect,
                    SpecialJudgeRunTimeError, Skipped, InteractorError,
                    PresentationError, OutputLimitExceeded
                  };
-
-inline int stateToStatus(ResultState in)
-{
-	if (in == CorrectAnswer) return 2;
-
-	if (in == PartlyCorrect) return 1;
-
-	return 0;
-}
-
-
 #endif // GLOBALTYPE_H

judgingdialog.cpp

@@ -29,6 +29,8 @@
 #include "contest.h"
 #include "task.h"
 #include "judgesharedvariables.h"
+#include "globaltype.h"
+#include "subtaskdependencelib.h"
 #include <QScrollBar>
 
 JudgingDialog::JudgingDialog(QWidget *parent) :
@@ -204,7 +206,7 @@ void JudgingDialog::singleCaseFinished(int progress, int x, int y, int result, i
 			}
 			else
 			{
-				scoretext = tr("  %1 Pt").arg(abs(scoreGot));
+				scoretext = tr("  %1 Pt").arg(qAbs(scoreGot));
 				scorecharFormat.setForeground(QBrush(Qt::darkYellow));
 			}
 
@@ -325,29 +327,27 @@ void JudgingDialog::singleSubtaskDependenceFinished(int x, int y, int status)
 	QTextCharFormat ratioFormat;
 	charFormat.setFontPointSize(9);
 	ratioFormat.setFontPointSize(9);
-	QString text;
+	QString text = statusRankingText(status);
 
-	if (status >= 2)
+	if (status >= mxDependValue)
 	{
-		text = QString(tr("Pure"));
 		charFormat.setForeground(QBrush(Qt::lightGray));
 		ratioFormat.setForeground(QBrush(Qt::green));
 	}
-	else if (status <= 0)
+	else if (status < 0)
 	{
-		text = QString(tr("Lost"));
 		charFormat.setForeground(QBrush(Qt::red));
 		ratioFormat.setForeground(QBrush(Qt::red));
 		ratioFormat.setFontWeight(QFont::Bold);
 	}
 	else
 	{
-		text = QString(tr("Far"));
-		charFormat.setForeground(QBrush(Qt::lightGray));
-		ratioFormat.setForeground(QBrush(Qt::cyan));
+		charFormat.setForeground(QBrush(Qt::darkYellow));
+		ratioFormat.setForeground(QBrush(Qt::darkYellow));
+		ratioFormat.setFontWeight(QFont::Bold);
 	}
 
-	cursor->insertText(tr("Subtask Dependence %1.%2: ").arg(x + 1).arg(y + 1), charFormat);
+	cursor->insertText(tr("Subtask Dependence %1: #%2: ").arg(x + 1).arg(y), charFormat);
 	cursor->insertText(text, ratioFormat);
 	QScrollBar *bar = ui->logViewer->verticalScrollBar();
 

judgingthread.cpp

@@ -144,6 +144,11 @@ auto JudgingThread::getScore() const -> int
 	return score;
 }
 
+auto JudgingThread::getFullScore() const -> int
+{
+	return fullScore;
+}
+
 auto JudgingThread::getJudgeTimes() const -> int
 {
 	return judgedTimes;

judgingthread.h

@@ -52,6 +52,7 @@ class JudgingThread : public QThread
 	int getTimeUsed() const;
 	int getMemoryUsed() const;
 	int getScore() const;
+	int getFullScore() const;
 	int getJudgeTimes() const;
 	ResultState getResult() const;
 	const QString &getMessage() const;

lemon.pro

@@ -76,6 +76,7 @@ HEADERS  += lemon.h \
     exttestcasemodifierdialog.h \
     exttestcasetable.h \
     exttestcaseupdaterdialog.h \
+    subtaskdependencelib.h \
     visualsettings.h \
     task.h \
     testcase.h \