diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 40957355..ffb75316 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,13 @@
+
+
+
+
+
+
diff --git a/src/TestingSystem/Common/Test/Test.java b/src/TestingSystem/Common/Test/Test.java
index 30f06ed7..2d314e84 100644
--- a/src/TestingSystem/Common/Test/Test.java
+++ b/src/TestingSystem/Common/Test/Test.java
@@ -18,7 +18,9 @@ import java.io.File;
import java.nio.file.Paths;
public class Test extends riDBObject {
@Description("DEFAULT 1")
- public int dim = 1; //размерность теста. для удобства пусть будет и внешним полем.
+ public int min_dim = 1; //мин размерность теста.
+ @Description("DEFAULT 1")
+ public int max_dim = 1; //макс размерность теста.
@Description("DEFAULT ''")
public String args = ""; //аргументы командной строки. на всякий случай поле зарезервирую. пусть будут.
@Description("DEFAULT -1")
@@ -27,7 +29,8 @@ public class Test extends riDBObject {
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Test t = (Test) src;
- dim = t.dim;
+ min_dim = t.min_dim;
+ max_dim = t.max_dim;
args = t.args;
group_id = t.group_id;
}
diff --git a/src/TestingSystem/Common/Test/TestDBTable.java b/src/TestingSystem/Common/Test/TestDBTable.java
index f9e93e0f..4325e097 100644
--- a/src/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/TestingSystem/Common/Test/TestDBTable.java
@@ -35,8 +35,10 @@ public class TestDBTable extends iDBTable {
case 2:
return object.description;
case 3:
- return object.dim;
+ return object.min_dim;
case 4:
+ return object.max_dim;
+ case 5:
return object.files;
default:
return null;
@@ -45,7 +47,11 @@ public class TestDBTable extends iDBTable {
@Override
public String[] getUIColumnNames() {
return new String[]{
- "имя", "размерность", "файлы"};
+ "имя",
+ "min_dim",
+ "max_dim",
+ "файлы"
+ };
}
@Override
public Current CurrentName() {
@@ -72,12 +78,14 @@ public class TestDBTable extends iDBTable {
@Override
public void fillFields() {
fields.tfName.setText(Result.description);
- fields.sDim.setValue(Result.dim);
+ fields.sMinDim.setValue(Result.min_dim);
+ fields.sMaxDim.setValue(Result.max_dim);
}
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
- Result.dim = (int) fields.sDim.getValue();
+ Result.min_dim = (int) fields.sMinDim.getValue();
+ Result.max_dim = (int) fields.sMaxDim.getValue();
if (!edit) {
Result.sender_name = Current.getAccount().name;
Result.sender_address = Current.getAccount().email;
diff --git a/src/TestingSystem/Common/Test/UI/TestFields.form b/src/TestingSystem/Common/Test/UI/TestFields.form
index 0080da03..5e287a76 100644
--- a/src/TestingSystem/Common/Test/UI/TestFields.form
+++ b/src/TestingSystem/Common/Test/UI/TestFields.form
@@ -1,6 +1,6 @@
-
+
@@ -33,15 +33,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/src/TestingSystem/Common/Test/UI/TestFields.java b/src/TestingSystem/Common/Test/UI/TestFields.java
index 3859ea95..4f63ca48 100644
--- a/src/TestingSystem/Common/Test/UI/TestFields.java
+++ b/src/TestingSystem/Common/Test/UI/TestFields.java
@@ -7,7 +7,8 @@ import java.awt.*;
public class TestFields implements DialogFields {
public JTextField tfName;
private JPanel content;
- public JSpinner sDim;
+ public JSpinner sMinDim;
+ public JSpinner sMaxDim;
@Override
public Component getContent() {
return content;
@@ -17,6 +18,7 @@ public class TestFields implements DialogFields {
tfName = new StyledTextField();
}
public TestFields(){
- sDim.setModel(new SpinnerNumberModel(1, 0, 16,1));
+ sMinDim.setModel(new SpinnerNumberModel(1, 0, 16,1));
+ sMaxDim.setModel(new SpinnerNumberModel(1, 0, 16,1));
}
}
diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
index 6bced39e..d3d50d9f 100644
--- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
+++ b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
@@ -67,12 +67,12 @@ public class ConvertCorrectnessTests extends TestingSystemPass {
db_project_info vizTestProject = new db_project_info(testProject, "", false);
switch (group.language) {
case fortran:
- test.dim = Current.getSapfor().getTextMaxDim(files[0], vizTestProject);
- System.out.println(test.dim);
+ test.max_dim = Current.getSapfor().getTextMaxDim(files[0], vizTestProject);
+ System.out.println(test.max_dim);
break;
case c:
- test.dim = Utils.getCTestMaxDim(files[0]);
- System.out.println(test.dim);
+ test.max_dim = Utils.getCTestMaxDim(files[0]);
+ System.out.println(test.max_dim);
break;
}
}
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/Visual_DVM_2021/Passes/All/PublishTest.java
index 1fe4180e..1b71897e 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTest.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTest.java
@@ -4,7 +4,6 @@ import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
-import ProjectData.Files.DBProjectFile;
import ProjectData.Project.db_project_info;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer;
@@ -33,15 +32,15 @@ public class PublishTest extends PublishServerObject {
target.files = String.join(";", filesNames);
//--
if (from_current_project) {
- target.dim = project.testMaxDim;
+ // target.max_dim = project.testMaxDim;
return super.fillObjectFields();
} else {
switch (project.languageName) {
case fortran:
- target.dim = Current.getSapfor().getTextMaxDim(null, project);
+ target.max_dim = Current.getSapfor().getTextMaxDim(null, project);
break;
case c:
- target.dim = Utils.getCProjectMaxDim(project);
+ target.max_dim = Utils.getCProjectMaxDim(project);
break;
}
return true;
diff --git a/src/Visual_DVM_2021/Passes/All/StartTests.java b/src/Visual_DVM_2021/Passes/All/StartTests.java
index a0a2200e..e5a62d3c 100644
--- a/src/Visual_DVM_2021/Passes/All/StartTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartTests.java
@@ -83,7 +83,7 @@ public class StartTests extends PublishServerAccountObject {
flags
);
testCompilationTask.runTasks = new Vector<>();
- Vector matrixes = configuration.getMatrixes(test.dim);
+ Vector matrixes = configuration.getMatrixes(test.max_dim);
Vector environments = configuration.getEnvironments();
for (String environmentSet : environments) {
if (flags.trim().equalsIgnoreCase("-s")) {