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

фикс бага с синхронизацией тестов из репозитория. забыл поменять почту со своей на серверную и они качались заново и множились.

Browse Source 
начал внедрение эталонов
++
This commit is contained in:
02090095
2025-03-14 19:13:04 +03:00
parent a2017f9e01
commit e2b307d4f6
12 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -5,6 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Constants;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -44,7 +45,7 @@ public class GroupsDBTable extends iDBTable<Group> {
}
public Group getGroupByDescription(LanguageName language_in, String description_in) {
for (Group group : Data.values()) {
if (group.sender_address.equals("vmk-post@yandex.ru") &&
if (group.sender_address.equals(Constants.MailAddress) &&
group.language.equals(language_in) && group.description.equalsIgnoreCase(description_in))
return group;
}

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

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
@@ -68,6 +69,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
kernels = Math.max(configuration.kernels, kernels);
//-
tasksCount = 0;
Index index = new Index();
Vector<DVMCompilationTask> compilationTasks = new Vector<DVMCompilationTask>();
for (DVMConfiguration configuration : configurations) {
DVMConfigurationCache cache = (DVMConfigurationCache) VisualCaches.GetCache(configuration);
@@ -77,6 +79,13 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
//---
DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
//--
/*
if (Global.normalProperties.CreateEthalonTasks){
params.insertElementAt(new Pair<>("-s", ""),0);
}
*/
//--
//---
for (Pair<String, String> p : params) {
//--
@@ -86,12 +95,15 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
completeEnvironments(p.getValue()) : p.getValue();
//--
DVMCompilationTask compilationTask =
new DVMCompilationTask(configuration, options_, group, test);
new DVMCompilationTask(index,configuration, options_, group, test);
compilationTasks.add(compilationTask);
//--
DVMRunTask ethalon=null;
Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
if (p.getKey().trim().equalsIgnoreCase("-s")) {
compilationTask.runTasks.add(new DVMRunTask(
index,
compilationTask,
configuration,
dvmSettings,
group,
@@ -104,6 +116,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
} else {
for (String matrix : matrixes) {
compilationTask.runTasks.add(new DVMRunTask(
index,
compilationTask,
configuration,
dvmSettings,
group,

13
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
View File

@@ -7,24 +7,11 @@ import java.io.Serializable;
import java.util.List;
import java.util.Vector;
public class DVMPackage_json implements Serializable {
@Expose
public int max_task_id = 0;
@Expose
public List<DVMCompilationTask> compilationTasks = new Vector<>();
public DVMPackage_json() {
}
public DVMPackage_json(List<DVMCompilationTask> tasks) {
for (DVMCompilationTask compilationTask : tasks) {
compilationTask.id = getMaxTaskId();
//-
for (DVMRunTask runTask : compilationTask.runTasks) {
runTask.id = getMaxTaskId();
runTask.dvmcompilationtask_id = compilationTask.id;
}
}
compilationTasks.addAll(tasks);
}
public int getMaxTaskId() {
return max_task_id++;
}
}

5
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Utils.Index;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
@@ -13,8 +14,8 @@ public class DVMCompilationTask extends DVMTask {
public DVMCompilationTask() {
}
//--
public DVMCompilationTask(DVMConfiguration configuration, String flags_in, Group group, Test test) {
super(configuration, group, test, flags_in);
public DVMCompilationTask(Index index,DVMConfiguration configuration, String flags_in, Group group, Test test) {
super(index,configuration, group, test, flags_in);
maxtime = configuration.c_maxtime;
}
//--

11
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -19,6 +20,8 @@ public class DVMRunTask extends DVMTask {
@Expose
public int dvmcompilationtask_id = CommonConstants.Nan;
@Expose
public int ethalon_id = CommonConstants.Nan; //эталон если есть.
@Expose
public String matrix = "";
@Expose
public String args = "";
@@ -38,14 +41,17 @@ public class DVMRunTask extends DVMTask {
public TaskState compilation_state = TaskState.Waiting;
@Expose
public double compilation_time = 0.0;
public DVMRunTask(DVMConfiguration configuration, DVMSettings settings,
public DVMRunTask(Index index,
DVMCompilationTask dvmCompilationTask,
DVMConfiguration configuration, DVMSettings settings,
Group group, Test test,
String matrix_in, String flags_in,
String environments_in,
int kernels_in
) {
super(configuration, group, test, flags_in);
super(index,configuration, group, test, flags_in);
//--------------------------
dvmcompilationtask_id = dvmCompilationTask.id;
//инфа о компиляции.
compilation_maxtime = configuration.c_maxtime;
compilation_state = TaskState.Waiting;
@@ -70,6 +76,7 @@ public class DVMRunTask extends DVMTask {
super.SynchronizeFields(src);
DVMRunTask rt = (DVMRunTask) src;
dvmcompilationtask_id = rt.dvmcompilationtask_id;
ethalon_id = rt.ethalon_id;
matrix = rt.matrix;
CleanTime = rt.CleanTime;
progress = rt.progress;

4
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import Common.Utils.Index;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -47,8 +48,9 @@ public class DVMTask extends iDBObject {
}
public DVMTask() {
}
public DVMTask(DVMConfiguration configuration,
public DVMTask(Index index, DVMConfiguration configuration,
Group group, Test test, String flags_in) {
id = index.Inc();
group_id = group.id;
test_id = test.id;
group_description = group.description;