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
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java
View File

@@ -160,13 +160,12 @@ public class SapforVersion_json implements Serializable {
ex.printStackTrace();
}
return text1.equalsIgnoreCase(text2);
// if (!Utils.compareFortranTexts(text1, text2)) {
// return false;
// }
// if (!Utils.compareFortranTexts(text1, text2)) {
// return false;
// }
}
return true;
}
public MessageError unpackMessage(String line_in) throws Exception {
MessageError res = new MessageError();
res.file = "";

2
src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
View File

@@ -60,7 +60,7 @@ public class PerformSapforTask extends Pass<SapforTask> {
}
//слегка изменить подход.
protected boolean transformation(PassCode code) throws Exception {
task = new File(parentTask, code.equals(PassCode.SPF_SharedMemoryParallelization)?"p1":"v1" );
task = new File(parentTask, code.equals(PassCode.SPF_SharedMemoryParallelization) ? "p1" : "v1");
Utils_.CheckAndCleanDirectory(task); //папка для преобразования.
//если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
target.versions.add(version_json = new SapforVersion_json(

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
View File

@@ -22,7 +22,7 @@ public class SapforConfiguration extends Configuration {
//--
Vector<Group> groups = cache.getGroups();
Vector<SapforSettings> settingsArray = cache.getSettings();
Vector<Test> tests= cache.getTests();
Vector<Test> tests = cache.getTests();
//--
Vector<LanguageName> groupsLanguages = new Vector<>();
for (Group group : groups) {

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -15,11 +14,12 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.Visual.RDataSetControlForm;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
import javax.swing.*;
public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
public class SapforConfigurationsForm extends RDataSetControlForm<SapforConfiguration> {
public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -117,9 +117,9 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
@Override
protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
if (current.ethalon_id!=CommonConstants.Nan){
if (current.ethalon_id != CommonConstants.Nan) {
Global.testingServer.db.sapforPackages.getUI().SetCurrentByPK(current.ethalon_id);
}else {
} else {
Global.testingServer.db.sapforPackages.getUI().ClearSelection();
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -75,7 +75,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
SapforPackage p = (SapforPackage) src;
sapforId = p.sapforId;
ethalon_id = p.ethalon_id;
mismatchesCount=p.mismatchesCount;
mismatchesCount = p.mismatchesCount;
}
@Override
public Class getJsonClass() {
@@ -107,9 +107,9 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
double percent = (((double) (good)) / tasksCount) * 100.0;
description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + tasksCount + ", из них с ошибками " + bad;
doneTasksCount= good;
doneTasksCount = good;
}
public boolean canCompare(SapforPackage package2, TextLog log){
public boolean canCompare(SapforPackage package2, TextLog log) {
if (package_json.tasks.size() != package2.package_json.tasks.size()) {
log.Writeln_("Количество задач в пакетах не совпадает!");
return false;

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -2,22 +2,24 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.*;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMilliseconds;
import Common.Visual.Tables.RendererProgressBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.RDataSetControlForm;
import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
import javax.swing.*;
import java.util.Comparator;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -178,8 +180,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
return object.state.equals(TasksPackageState.DoneWithErrors);
}
}
);
);
}
}

5
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -11,9 +10,10 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
public class SapforSettingsForm extends RDataSetControlForm<SapforSettings> {
public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -40,7 +40,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
}
);
}
@Override
protected void createFilters() {
AddFilters(new HeaderTextFilter<>(dataSource, 2, 65),

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -9,9 +8,10 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> {
public class SapforSettingsCommandsForm extends RDataSetControlForm<SapforSettingsCommand> {
public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -226,13 +226,12 @@ public class SapforTask extends DBObject {
}
@Override
public String toString() {
return
"#" + id + " группа "
+ Utils_.Brackets(group_description) +
" тест " + Utils_.Brackets(test_description)
+ " параметры "
+ Utils_.Brackets(configuration_description.isEmpty()?sapfor_configuration_id: configuration_description);
+ Utils_.Brackets(configuration_description.isEmpty() ? sapfor_configuration_id : configuration_description);
// getUniqueKey();
}
public String getPassesInfo() {

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
View File

@@ -1,11 +1,9 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Utils.Utils_;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
public ImageIcon getIcon() {
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
// Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
return (getImageKey() != null) ? res : null;
}

7
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -43,7 +43,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
repo = new File(Utils_.getHomeDirectory(), "Repo");
repo_sapfor = new File(repo, "SAPFOR");
//-
repo_sapfor_installation_directory =new File(repo_sapfor, "install");
repo_sapfor_installation_directory = new File(repo_sapfor, "install");
repo_out = new File(repo_sapfor_installation_directory, Constants.out_file);
repo_err = new File(repo_sapfor_installation_directory, Constants.err_file);
repo_sapfor_assembly = new File(repo_sapfor_installation_directory, "Sapfor_F");
@@ -238,7 +238,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
Utils.CleanDirectory(repo);
Utils.startScript(repo, repo, "git_clone",
"git clone " + Constants.SAPFOR_REPOSITORY + " " +
Utils_.DQuotes(repo_sapfor)+
Utils_.DQuotes(repo_sapfor) +
" 1>spf_out.txt 2>spf_err.txt\n").waitFor();
}
void CompileSapfor() throws Exception {
@@ -247,7 +247,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
Utils_.CheckAndCleanDirectory(repo_sapfor_installation_directory);
//--
Utils.startScript(repo_sapfor_installation_directory, repo_sapfor_installation_directory, "build_sapfor",
"cmake .. 1>" + Constants.out_file + " 2>" + Constants.err_file +
"cmake .. 1>" + Constants.out_file + " 2>" + Constants.err_file +
"\nmake -j 14 1>>" +
Constants.out_file +
" 2>>" +
@@ -293,7 +293,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
FileUtils.copyFile(repo_sapfor_assembly, sapforBin);
sapforBin.setExecutable(true, false);
//--
sapfor.call_command = sapforBin.getAbsolutePath();
sapfor.buildDate = new Date().getTime();
//--

8
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -22,18 +22,18 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ServerSapforsForm(this, mountPanel);
}
public ServerSapfor getLastDoneVersion(){
public ServerSapfor getLastDoneVersion() {
Vector<ServerSapfor> versions = new Vector<>();
for (ServerSapfor serverSapfor: Data.values()){
for (ServerSapfor serverSapfor : Data.values()) {
if (serverSapfor.state.equals(ServerSapforState.Done))
versions.add(serverSapfor);
}
versions.sort(new Comparator<ServerSapfor>() {
@Override
public int compare(ServerSapfor o1, ServerSapfor o2) {
return Long.compare(o1.buildDate,o2.buildDate);
return Long.compare(o1.buildDate, o2.buildDate);
}
});
return versions.isEmpty()?null:versions.lastElement();
return versions.isEmpty() ? null : versions.lastElement();
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
@@ -9,10 +8,11 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
import java.util.Comparator;
public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
public class ServerSapforsForm extends RDataSetControlForm<ServerSapfor> {
public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}