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
2026-02-24 16:01:36 +03:00
parent b30f2b8eea
commit d64f11e856
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,16 +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/TestingSystem/DVM/json/CompilationTask_json.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/Task_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

3
src/_VisualDVM/Constants.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { public class Constants {
public static final int version = 1266; public static final int version = 1266;
public static final int planner_version = 24; public static final int planner_version = 26;
public static final int testingMaxKernels = 64; public static final int testingMaxKernels = 64;
//-- //--
public static final String ApplicationFileName = "VisualSapfor.jar"; public static final String ApplicationFileName = "VisualSapfor.jar";
@@ -105,6 +105,7 @@ public class Constants {
"starter.cpp", "starter.cpp",
"launcher.cpp", "launcher.cpp",
//-- //--
"json.hpp",
"Array.h", "Array.h",
"CompilationSupervisor.h", "CompilationSupervisor.h",
"CompilationTask.h", "CompilationTask.h",

16
src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -79,25 +79,25 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json(); DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json();
DVMRunPackage_json runPackage_json = new DVMRunPackage_json(); DVMRunPackage_json runPackage_json = new DVMRunPackage_json();
//положить туда запакованные тексты задач. //положить туда запакованные тексты задач.
Vector<String> compilationLines_OLD = new Vector<>(); //старые. выкинуть. // Vector<String> compilationLines_OLD = new Vector<>(); //старые. выкинуть.
Vector<String> runLines_OLD = new Vector<>(); //старые, выкинуть. // Vector<String> runLines_OLD = new Vector<>(); //старые, выкинуть.
for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) { for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
String makefileText = generateMakefile(tests.get(compilationTask.test_id), compilationTask.language, testingPackage.drv, compilationTask.flags); String makefileText = generateMakefile(tests.get(compilationTask.test_id), compilationTask.language, testingPackage.drv, compilationTask.flags);
compilationLines_OLD.addAll(compilationTask.pack(makefileText)); //old // compilationLines_OLD.addAll(compilationTask.pack(makefileText)); //old
//-- //--
compilationPackage_json.tasks.add(new CompilationTask_json(compilationTask, makefileText)); compilationPackage_json.tasks.add(new CompilationTask_json(compilationTask, makefileText));
//-- //--
for (DVMRunTask runTask : compilationTask.runTasks) { for (DVMRunTask runTask : compilationTask.runTasks) {
runLines_OLD.addAll(runTask.pack(null)); //оld // runLines_OLD.addAll(runTask.pack(null)); //оld
//-- //--
runPackage_json.tasks.add(new RunTask_json(runTask)); runPackage_json.tasks.add(new RunTask_json(runTask));
} }
} }
//упразднить //упразднить
RemoteFile compilationFile_old = new RemoteFile(packageRemoteWorkspace, "compilationTasks"); // RemoteFile compilationFile_old = new RemoteFile(packageRemoteWorkspace, "compilationTasks");
RemoteFile runPackage_old = new RemoteFile(packageRemoteWorkspace, "runTasks"); // RemoteFile runPackage_old = new RemoteFile(packageRemoteWorkspace, "runTasks");
user.connection.writeToFile(String.join("\n", compilationLines_OLD) + "\n", compilationFile_old); // user.connection.writeToFile(String.join("\n", compilationLines_OLD) + "\n", compilationFile_old);
user.connection.writeToFile(String.join("\n", runLines_OLD) + "\n", runPackage_old); // user.connection.writeToFile(String.join("\n", runLines_OLD) + "\n", runPackage_old);
//-- //--
RemoteFile compilationFile_json = new RemoteFile(packageRemoteWorkspace, "compilationTasks.json"); RemoteFile compilationFile_json = new RemoteFile(packageRemoteWorkspace, "compilationTasks.json");
RemoteFile runFile_json = new RemoteFile(packageRemoteWorkspace, "runTasks.json"); RemoteFile runFile_json = new RemoteFile(packageRemoteWorkspace, "runTasks.json");

2
src/files/version.h
View File

@@ -1 +1 @@
25 26