From a8c8aa321238d5582b9f5868c12c92c065f0e239 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 14 Dec 2023 21:11:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20planner=20c=20=D0=BF=D1=80=D0=BE=D0=B3?=
 =?UTF-8?q?=D1=80=D0=B5=D1=81=D1=81=D0=BE=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          | 3 +--
 src/TestingSystem/DVM/DVMTestingPlanner.java | 6 ++++++
 src/files/Planner/Supervisor.h               | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d6bc17f1..2225b267 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,8 @@
   <component name="ChangeListManager">
     <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$/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/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index 167ce2f5..47680992 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -177,10 +177,14 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         LinkedHashMap<Integer, File> tests = getTestsFromJson();
         //синхронизировать их.
         for (int test_id : tests.keySet()) {
+            Print("testId="+test_id);
             File test = tests.get(test_id);
             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.SynchronizeSubDirsR(test, test_dst);
+            Print("done");
         }
     }
     @Override
@@ -349,6 +353,8 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         //--
         packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
         packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
+        //-
+        Print("packageremoteWorkspace="+Utils.Brackets(packageRemoteWorkspace.full_name));
     }
     @Override
     protected boolean Connect() {
diff --git a/src/files/Planner/Supervisor.h b/src/files/Planner/Supervisor.h
index 09766cf3..690e478d 100644
--- a/src/files/Planner/Supervisor.h
+++ b/src/files/Planner/Supervisor.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include <queue>
+#include <math.h>
 #include "File.h"   
 #include "Task.h"
 #include "Array.h"
@@ -127,7 +128,8 @@ public:
         vector<T*> toDel;
         
         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;
 
         while (activeTasks) {