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
2024-09-14 00:18:27 +03:00
parent 756c2d214f
commit 91a509b3de
29 changed files with 272 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/TestingSystem/DVM/Configuration/ConfigurationDBTable.java
View File

@@ -8,9 +8,9 @@ import Common.UI.VisualiserStringList;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import TestingSystem.DVM.Configuration.UI.ConfigurationFields;
public class ConfigurationDBTable extends iDBTable<Configuration> {
public class ConfigurationDBTable extends iDBTable<DVMConfiguration> {
public ConfigurationDBTable() {
super(Configuration.class);
super(DVMConfiguration.class);
}
@Override
public Current CurrentName() {
@@ -57,7 +57,7 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
};
}
@Override
public Object getFieldAt(Configuration object, int columnIndex) {
public Object getFieldAt(DVMConfiguration object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description;
@@ -78,7 +78,7 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
case 10:
return object.max_dim_proc_count;
case 11:
return object.r_maxtime;
return object.maxtime;
case 12:
return Utils.unpackStrings(object.usr_par, true);
default:
@@ -86,8 +86,8 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
}
}
@Override
public DBObjectDialog<Configuration, ConfigurationFields> getDialog() {
return new DBObjectDialog<Configuration, ConfigurationFields>(ConfigurationFields.class) {
public DBObjectDialog<DVMConfiguration, ConfigurationFields> getDialog() {
return new DBObjectDialog<DVMConfiguration, ConfigurationFields>(ConfigurationFields.class) {
@Override
public int getDefaultHeight() {
return 480;
@@ -111,7 +111,7 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
public void fillFields() {
fields.tfName.setText(Result.description);
//------->>>>
((VisualiserStringList) (fields.flagsList)).fill(Result.getFlags());
((VisualiserStringList) (fields.flagsList)).fill(Result.getFlagsArray());
((VisualiserStringList) (fields.environmentsList)).fill(Result.getEnvironments());
((VisualiserStringList) (fields.parList)).fill(Result.getParams());
//------->>>>
@@ -120,7 +120,7 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
fields.sMinDimProc.setValue(Result.min_dim_proc_count);
fields.sMaxDimProc.setValue(Result.max_dim_proc_count);
fields.cbCube.setSelected(Result.cube == 1);
fields.sRunMaxtime.setValue(Result.r_maxtime);
fields.sRunMaxtime.setValue(Result.maxtime);
//-
fields.sMaxProc.setValue(Result.max_proc_count);
}
@@ -132,7 +132,7 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
Result.max_dim_proc_count = (int) fields.sMaxDimProc.getValue();
Result.cube = fields.cbCube.isSelected() ? 1 : 0;
Result.max_proc_count = (int) fields.sMaxProc.getValue();
Result.r_maxtime = (int) fields.sRunMaxtime.getValue();
Result.maxtime = (int) fields.sRunMaxtime.getValue();
Result.flags = ((VisualiserStringList) (fields.flagsList)).pack();
Result.environments = ((VisualiserStringList) (fields.environmentsList)).pack();
Result.usr_par = ((VisualiserStringList) (fields.parList)).pack();
@@ -157,6 +157,6 @@ public class ConfigurationDBTable extends iDBTable<Configuration> {
}
@Override
public boolean ShowEditObjectDialog(DBObject object) {
return (Current.getAccount().CheckAccessRights(((Configuration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
return (Current.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
}

50
src/TestingSystem/DVM/Configuration/Configuration.java → src/TestingSystem/DVM/Configuration/DVMConfiguration.java
View File

@@ -1,46 +1,33 @@
package TestingSystem.DVM.Configuration;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Utils.Utils;
import GlobalData.RunConfiguration.RunConfiguration;
import TestingSystem.Common.Configuration;
import java.util.Vector;
public class Configuration extends riDBObject {
//конфгурация тестирования ДВМ
public class DVMConfiguration extends Configuration {
//компиляция.
public String flags = "\n";
public int c_maxtime = 40;
//матрица
public int cube = 0;
public int cube = 0; //
public int max_proc_count = 4;
public int min_dim_proc_count = 1;
public int max_dim_proc_count = 4;
//запуск
public String environments="\n";
public String usr_par = "";
public int r_maxtime = 300;
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Configuration c = (Configuration) src;
flags = c.flags;
c_maxtime=c.c_maxtime;
cube= c.cube;
max_proc_count=c.max_proc_count;
min_dim_proc_count=c.min_dim_proc_count;
max_dim_proc_count=c.max_dim_proc_count;
environments=c.environments;
usr_par=c.usr_par;
r_maxtime=c.r_maxtime;
public String getFlags() {
return flags;
}
public Configuration(Configuration src){
this.SynchronizeFields(src);
}
public Configuration(){}
//--
public Vector<String> getFlags() {
@Override
public Vector<String> getFlagsArray() {
return Utils.unpackStrings(flags);
}
//-
public Vector<String> getEnvironments() {
return Utils.unpackStrings(environments);
}
@@ -95,7 +82,22 @@ public class Configuration extends riDBObject {
if ((params.size() == 1) && params.get(0).isEmpty()) return "";
return String.join("\n", params);
}
public String getSummary() {
return description;
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
DVMConfiguration c = (DVMConfiguration) src;
flags = c.flags;
c_maxtime=c.c_maxtime;
cube= c.cube;
max_proc_count=c.max_proc_count;
min_dim_proc_count=c.min_dim_proc_count;
max_dim_proc_count=c.max_dim_proc_count;
environments=c.environments;
usr_par=c.usr_par;
}
public DVMConfiguration(DVMConfiguration src){
this.SynchronizeFields(src);
}
public DVMConfiguration(){}
}

25
src/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -5,10 +5,15 @@ import Common.Global;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import java.io.File;
import java.util.Vector;
public class DVMPackage extends TestingPackage<DVMPackage_json> {
//---
public String machine_name = "";
@@ -56,4 +61,22 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
return (!DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address))&&
(!DVMPackageDBTable.filterActive || state.isActive() );
}
public void saveTasks(Vector<DVMCompilationTask> tasks, int allTasksCount){
tasksCount=allTasksCount;
//--
package_json=new DVMPackage_json();
DVMPackage_json json = package_json;
//инициализируем идентификаторы задач.
for (DVMCompilationTask compilationTask : tasks) {
//--
compilationTask.id = json.getMaxTaskId();
//-
for (DVMRunTask runTask : compilationTask.runTasks) {
runTask.id = json.getMaxTaskId();
runTask.dvmcompilationtask_id = compilationTask.id;
}
}
json.compilationTasks.addAll(tasks);
}
}

5
src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
View File

@@ -1,9 +1,4 @@
package TestingSystem.DVM.DVMPackage;
import Common.Constants;
import Common.Global;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import com.google.gson.annotations.Expose;

7
src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -1,10 +1,7 @@
package TestingSystem.DVM.DVMTasks;
import Common.Database.DBObject;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMPackage.DVMPackage_json;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import com.google.gson.annotations.Expose;
import java.util.List;
@@ -13,7 +10,7 @@ public class DVMCompilationTask extends DVMTask {
@Expose
public List<DVMRunTask> runTasks = new Vector<>();
//-
public DVMCompilationTask(Configuration configuration,
public DVMCompilationTask(DVMConfiguration configuration,
Group group,
Test test,
String flags_in

6
src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -7,7 +7,7 @@ import GlobalData.Tasks.TaskState;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import com.google.gson.annotations.Expose;
import java.io.File;
@@ -40,7 +40,7 @@ public class DVMRunTask extends DVMTask {
public TaskState compilation_state = TaskState.Waiting;
@Expose
public double compilation_time = 0.0;
public DVMRunTask(Configuration configuration,
public DVMRunTask(DVMConfiguration configuration,
Group group, Test test,
String matrix_in, String flags_in,
String environments_in,
@@ -56,7 +56,7 @@ public class DVMRunTask extends DVMTask {
cube = configuration.cube;
min_dim = configuration.max_dim_proc_count;
max_dim = configuration.max_dim_proc_count;
maxtime = configuration.r_maxtime;
maxtime = configuration.maxtime;
environments = environments_in;
usr_par = par_in;
args = test.args;

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

@@ -8,7 +8,7 @@ import ProjectData.LanguageName;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.Configuration.Configuration;
import TestingSystem.DVM.Configuration.DVMConfiguration;
import com.google.gson.annotations.Expose;
import org.apache.commons.io.FileUtils;
@@ -63,7 +63,7 @@ public class DVMTask extends iDBObject {
}
public DVMTask() {
}
public DVMTask(Configuration configuration,
public DVMTask(DVMConfiguration configuration,
Group group, Test test, String flags_in) {
group_id = group.id;
test_id = test.id;

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

@@ -111,6 +111,7 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
protected void Print(String message) {
try {
if (isPrintOn()) {
System.out.println(message);
Global.Log.Print(message);
}
} catch (Exception ex) {

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

@@ -46,21 +46,27 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
//----
@Override
protected void TestsSynchronize() throws Exception {
System.out.println("--");
testingPackage.readJson();
System.out.println("+");
LinkedHashMap<Integer, File> tests = getTestsFromJson();
//синхронизировать их.
for (int test_id : tests.keySet()) {
System.out.println("test="+test_id);
File test = tests.get(test_id);
RemoteFile test_dst = new RemoteFile(testingPackage.user_workspace + "/projects/" + test_id, true);
user.connection.MKDIR(test_dst);
user.connection.SynchronizeSubDirsR(test, test_dst);
}
System.out.println("++");
}
@Override
protected void PackageWorkspaceCreation() throws Exception {
System.out.println("package workspace creation");
if (!CheckModules()) {
return;
}
System.out.println("modules checked");
//--
testingPackage.readJson();
//--