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

обновление planner c прогрессом.

Browse Source
This commit is contained in:
02090095
2023-12-14 21:11:24 +03:00
parent ff3e3003d4
commit a8c8aa3212
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -8,9 +8,8 @@
<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 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$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

6
src/TestingSystem/DVM/DVMTestingPlanner.java
View File

@@ -177,10 +177,14 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
LinkedHashMap<Integer, File> tests = getTestsFromJson(); LinkedHashMap<Integer, File> tests = getTestsFromJson();
//синхронизировать их. //синхронизировать их.
for (int test_id : tests.keySet()) { for (int test_id : tests.keySet()) {
Print("testId="+test_id);
File test = tests.get(test_id); File test = tests.get(test_id);
RemoteFile test_dst = new RemoteFile(testingPackage.user_workspace + "/projects/" + test_id, true); RemoteFile test_dst = new RemoteFile(testingPackage.user_workspace + "/projects/" + test_id, true);
Print("src="+test.getAbsolutePath());
Print("dst="+test_dst.full_name);
user.connection.MKDIR(test_dst); user.connection.MKDIR(test_dst);
user.connection.SynchronizeSubDirsR(test, test_dst); user.connection.SynchronizeSubDirsR(test, test_dst);
Print("done");
} }
} }
@Override @Override
@@ -349,6 +353,8 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
//-- //--
packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true); packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id)); packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
//-
Print("packageremoteWorkspace="+Utils.Brackets(packageRemoteWorkspace.full_name));
} }
@Override @Override
protected boolean Connect() { protected boolean Connect() {

4
src/files/Planner/Supervisor.h
View File

@@ -4,6 +4,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
#include <queue> #include <queue>
#include <math.h>
#include "File.h" #include "File.h"
#include "Task.h" #include "Task.h"
#include "Array.h" #include "Array.h"
@@ -127,7 +128,8 @@ public:
vector<T*> toDel; vector<T*> toDel;
size_t done = 0; size_t done = 0;
size_t step = activeTasks * 0.01; // step == 1% //size_t step = activeTasks * 0.01; // step == 1%
size_t step = ceil(activeTasks * 0.01); // step == 1%
const double total = activeTasks; const double total = activeTasks;
while (activeTasks) { while (activeTasks) {