Merge pull request #248 from crocs-muni/devel

move results files to separate respository (github.com/crocs-muni/jcalgtest_results/), web generation improvements

AlgTest_Process/src/algtestprocess/AlgTestProcess.java

@@ -58,6 +58,10 @@ public class AlgTestProcess {
  public static final String GENERATE_UNKNOWN_RESULTS = "UNKNOWN"; //RESULTS FOR UNKNOWN CARD
  public static final String GENERATE_RADAR_GRAPHS = "RADAR"; //ONE BIG TABLE FOR COMPARE CARDS 
 
+ //public static final String GITHUB_RESULTS_REPO_LINK = "https://github.com/crocs-muni/JCAlgTest/"; 
+ public static final String GITHUB_RESULTS_REPO_LINK = "https://github.com/crocs-muni/jcalgtest_results/"; // base link to github with results 
+
+
  public static String m_inputBasePath = "";
  public static String m_outputBasePath = "";
  /**

AlgTest_Process/src/algtestprocess/JCinfohtml.java

@@ -39,6 +39,7 @@ may be distributed under the terms of the GNU General Public License (GPL),
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Collections;
 
 /**
  *
@@ -152,7 +153,7 @@ public static HashMap<String, String> detailsBasic(List<String> lines, FileOutpu
  toFile = "";
  toFile += "<div class=\"col-md-5 col-xs-5\">\n";
  toFile += "<h3>Test details</h3>\n";
- toFile += "<p>Execution date/time: <strong>" + infoMap.get("Execution date/time") + ", <a href=\"https://github.com/crocs-muni/JCAlgTest/tree/master/Profiles/performance\" target=\"_blank\">CSV source data</a></strong></p>\n";
+ toFile += "<p>Execution date/time: <strong>" + infoMap.get("Execution date/time") + ", <a href=\"" + AlgTestProcess.GITHUB_RESULTS_REPO_LINK + "tree/master/javacard/Profiles/performance\" target=\"_blank\">CSV source data</a></strong></p>\n";
  toFile += "<p>AlgTestJClient version: <strong>" + infoMap.get("AlgTestJClient version") + "</strong></p>\n";
  toFile += "<p>AlgTest applet version: <strong>" + infoMap.get("AlgTest applet version") + "</strong></p>\n";
  toFile += "<p>Used reader: <strong>" + infoMap.get("Used reader") + "</strong></p>\n";
@@ -302,6 +303,7 @@ public static void compareTable(String inputDir, String outputDir, FileOutputStr
  List<String> topAcronyms_asym = new ArrayList<>();
  loadTopFunctions(topNames_sym, topAcronyms_sym, topNames_asym, topAcronyms_asym, true);
  List<String> files = listFilesForFolder(new File(inputDir));
+ Collections.sort(files);
  if (unknownMode) {
  files.add(0, unknownCard);
  }

AlgTest_Process/src/algtestprocess/RadarGraph.java

@@ -37,6 +37,7 @@ may be distributed under the terms of the GNU General Public License (GPL),
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Collections;
 
 /**
  * Class provides generation of Radar graphs for visual card comparison.
@@ -234,6 +235,7 @@ public static void generateRadarMain(String outputDir, List<String> namesOfCards
 
  public static void runRadarGraph(String inputDir, String outputDir) throws FileNotFoundException, IOException{
  List<String> namesOfCards = generateRadarGraphs(inputDir, outputDir);
+ Collections.sort(namesOfCards);
  generateRadarMain(outputDir, namesOfCards);
  System.out.println("ADD all necessary scripts (header-1.js, RadarChart.js) to newly generated folder."); 
  }

AlgTest_Process/src/algtestprocess/RunTime.java

@@ -174,8 +174,10 @@ public static Integer parseOne(List<String> lines, FileOutputStream file, Intege
  if (prepare.length < 2) {
  System.out.println("Unexpected format of line '" + lines.get(lp) + "'");
  }
- toFile += "<td><b>"+prepare[1]+"</b></td>"; //classic name without reference to chart
- //toFile += "<td><a class=\"fancybox fancybox.iframe\" href=\"./graphs/" + prepare[1] + ".html\" style=\"font-size:12px;\">" + prepare[1] + "</a></td>";
+ else {
+ toFile += "<td><b>"+prepare[1]+"</b></td>"; //classic name without reference to chart
+ //toFile += "<td><a class=\"fancybox fancybox.iframe\" href=\"./graphs/" + prepare[1] + ".html\" style=\"font-size:12px;\">" + prepare[1] + "</a></td>";
+ }
  lp += 2;
  }
 

AlgTest_Process/src/algtestprocess/ScalabilityGraph.java

@@ -42,6 +42,7 @@ may be distributed under the terms of the GNU General Public License (GPL),
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Collections;
 
 /**
  * Class provide generation of scalability graphs which shows dependency between length of processed data and operation time.
@@ -297,6 +298,8 @@ public static void generateScalabilityMain(String dir, String outDir, List<Strin
 
  public static void runScalability(String dir, String outDir, Boolean toponly) throws FileNotFoundException, IOException{
  List<String> namesOfCards = generateScalabilityFolder(dir, outDir, false);
+ // sort cards by names
+ Collections.sort(namesOfCards);
  generateScalabilityMain(dir, outDir, namesOfCards);
  // System.out.println("ADD all necessary scripts (header-1.js, RadarChart.js) to new generated folder."); 
  }

AlgTest_Process/src/algtestprocess/SupportTable.java

@@ -57,13 +57,12 @@ may be distributed under the terms of the GNU General Public License (GPL),
 import java.util.TreeSet;
 
 /**
- * Generates pefrormance similarity table, contains tooltips with differences in algorithm support.
+ * Generates performance similarity table, contains tooltips with differences in algorithm support.
  * @author rk
  */
 public class SupportTable {
 
- public static final String JCALGTEST_RESULTS_REPO_PATH = "https://github.com/crocs-muni/JCAlgTest/tree/master/Profiles/results/"; // original path within code repository
- //public static final String JCALGTEST_RESULTS_REPO_PATH = "https://github.com/crocs-muni/jcalgtest_results/tree/main/javacard/Profiles/results/";
+ public static final String JCALGTEST_RESULTS_REPO_PATH = AlgTestProcess.GITHUB_RESULTS_REPO_LINK + "tree/master/javacard/Profiles/results/"; 
 
  // if one card results are generated
  public static final String[] JAVA_CARD_VERSION = {"2.1.2", "2.2.1", "2.2.2"};