M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-03-16 14:11:44 +03:00
parent b6b7bb3ae5
commit 933638afb8
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/workspace.xml generated
View File

@@ -7,14 +7,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksComparisonForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

6
properties
View File

@@ -32,9 +32,9 @@
"CompleteRunEnvironments": true, "CompleteRunEnvironments": true,
"CreateEthalonTasks": true, "CreateEthalonTasks": true,
"ErasePackageWorkspace": true, "ErasePackageWorkspace": true,
"lastMachineId": 28, "lastMachineId": 29,
"lastUserId": 36, "lastUserId": 37,
"lastCompilerId": 110, "lastCompilerId": -1,
"RegisterOn": false, "RegisterOn": false,
"SpacesOn": false, "SpacesOn": false,
"EmptyLinesOn": false, "EmptyLinesOn": false,

2
src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java
View File

@@ -24,7 +24,7 @@ public class CompareDVMRunTaskToEthalon extends Pass<DVMRunTask> {
if (target.ethalon_id != CommonConstants.Nan && Global.testingServer.db.dvmRunTasks.containsKey(target.ethalon_id)) { if (target.ethalon_id != CommonConstants.Nan && Global.testingServer.db.dvmRunTasks.containsKey(target.ethalon_id)) {
ethalon= Global.testingServer.db.dvmRunTasks.get(target.ethalon_id); ethalon= Global.testingServer.db.dvmRunTasks.get(target.ethalon_id);
return true; return true;
}else Log.Writeln_("Не найдено эталона для задачи "+ Utils_.Brackets(target.id+" !")); }else Log.Writeln_("Не найдено эталона для задачи "+ Utils_.Brackets(target.id)+" !");
} }
return false; return false;
} }

4
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -286,8 +286,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void CompareCurrentDVMTaskToEthalon(DVMRunTask ethalon, DVMRunTask task) throws Exception { public void CompareCurrentDVMTaskToEthalon(DVMRunTask ethalon, DVMRunTask task) throws Exception {
dvmTestingRunMaster.ApplyObject(ethalon); dvmTestingRunMaster.ApplyObject(ethalon);
dvmTestingRunSlave.ApplyObject(task); dvmTestingRunSlave.ApplyObject(task);
dvmTestingRunMaster.ChangeState(TasksComparisonState.RunOutput);
dvmTestingRunSlave.ChangeState(TasksComparisonState.RunOutput);
dvmTestingRunMaster.Compare(); dvmTestingRunMaster.Compare();
// dvmTestingRunMaster.ChangeState(TasksComparisonState.RunOutput);
// dvmTestingRunSlave.ChangeState(TasksComparisonState.RunOutput);
} }
} }