++
исправление бага с тестированием
This commit is contained in:
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
||||
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1245;
|
||||
public static final int version = 1246;
|
||||
public static final int planner_version = 24;
|
||||
public static final int testingMaxKernels = 64;
|
||||
//--
|
||||
|
||||
@@ -672,8 +672,12 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
Vector<Pair<String, String>> res = new Vector<>();
|
||||
Vector<DVMCompilationOptionsSet> optionsSets = getVectorByFK(dvmSettings_in, DVMCompilationOptionsSet.class);
|
||||
Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings_in, DVMEnvironmentsSet.class);
|
||||
//--
|
||||
for (int i = 0; i < optionsSets.size(); ++i) {
|
||||
//----
|
||||
if (optionsSets.isEmpty() && environmentsSets.isEmpty()){
|
||||
return res;
|
||||
}
|
||||
int size_ = Math.min(optionsSets.size(), environmentsSets.size());
|
||||
for (int i = 0; i < size_; ++i) {
|
||||
Vector<DVMCompilationOption> options = getVectorByFK(optionsSets.get(i), DVMCompilationOption.class);
|
||||
Vector<DVMEnvironment> environments = getVectorByFK(environmentsSets.get(i), DVMEnvironment.class);
|
||||
String optionsLine = printOptionsLine(options);
|
||||
@@ -682,13 +686,23 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
optionsLine,
|
||||
environmentsLine));
|
||||
}
|
||||
if (optionsSets.size() < environmentsSets.size()) {
|
||||
//дополнения
|
||||
if (optionsSets.size()<environmentsSets.size()){
|
||||
for (int i = optionsSets.size(); i < environmentsSets.size(); ++i) {
|
||||
res.add(new Pair<>(
|
||||
"",
|
||||
printEnvironmentsLine(getVectorByFK(environmentsSets.get(i), DVMEnvironment.class))
|
||||
));
|
||||
}
|
||||
}else {
|
||||
if (optionsSets.size() > environmentsSets.size()) {
|
||||
for (int i = environmentsSets.size(); i < optionsSets.size(); ++i) {
|
||||
res.add(new Pair<>(
|
||||
printOptionsLine(getVectorByFK(optionsSets.get(i), DVMCompilationOption.class)),
|
||||
""
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user