Skip to content

Commit be03569

Browse files
authored
Merge pull request #8 from K2NIO/autoCompUpdate
"These updates introduce the ability for Automatic Comparison configuration within Eclipse and Mars plugins. Latest CyBench class files are included as well. CyBenchLauncher (the comparable BenchmarkRunner for Eclipse/Mars) was updated to behave similarly to BenchmarkRunner."
2 parents 71c4a8d + 8bf0886 commit be03569

File tree

107 files changed

+1522
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1522
-45
lines changed

README.md

Lines changed: 15 additions & 0 deletions

com.gocypher.cybench.externals/.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,15 @@
2525
<nature>org.eclipse.pde.PluginNature</nature>
2626
<nature>org.eclipse.jdt.core.javanature</nature>
2727
</natures>
28+
<filteredResources>
29+
<filter>
30+
<id>1649690857998</id>
31+
<name></name>
32+
<type>30</type>
33+
<matcher>
34+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
35+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
36+
</matcher>
37+
</filter>
38+
</filteredResources>
2839
</projectDescription>

com.gocypher.cybench.externals/META-INF/MANIFEST.MF

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Cybench Externals
44
Bundle-SymbolicName: com.gocypher.cybench.externals
5-
Bundle-Version: 1.0.0.qualifier
5+
Bundle-Version: 1.0.1.qualifier
66
Bundle-ClassPath: .
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
88
Automatic-Module-Name: com.gocypher.cybench.externals
@@ -241,6 +241,8 @@ Export-Package: com.fasterxml.jackson.annotation;version="2.11.2",
241241
com.fasterxml.jackson.databind.introspect,
242242
com.fasterxml.jackson.databind.jsontype,
243243
com.fasterxml.jackson.databind.type",
244+
com.gocypher.cybench,
245+
com.gocypher.cybench.core,
244246
com.gocypher.cybench.core.annotation,
245247
com.gocypher.cybench.core.model,
246248
com.gocypher.cybench.core.utils,
@@ -249,9 +251,10 @@ Export-Package: com.fasterxml.jackson.annotation;version="2.11.2",
249251
com.gocypher.cybench.launcher.environment.services,
250252
com.gocypher.cybench.launcher.model,
251253
com.gocypher.cybench.launcher.report,
252-
com.gocypher.cybench.launcher.scores,
253-
com.gocypher.cybench.launcher.services,
254254
com.gocypher.cybench.launcher.utils,
255+
com.gocypher.cybench.model,
256+
com.gocypher.cybench.services,
257+
com.gocypher.cybench.utils,
255258
com.jcabi.log,
256259
com.jcabi.manifests,
257260
com.profesorfalken.jpowershell,
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

com.gocypher.cybench.plugin.tools/.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,15 @@
2525
<nature>org.eclipse.pde.PluginNature</nature>
2626
<nature>org.eclipse.jdt.core.javanature</nature>
2727
</natures>
28+
<filteredResources>
29+
<filter>
30+
<id>1649690858007</id>
31+
<name></name>
32+
<type>30</type>
33+
<matcher>
34+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
35+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
36+
</matcher>
37+
</filter>
38+
</filteredResources>
2839
</projectDescription>

com.gocypher.cybench.plugin.tools/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
66
Bundle-Activator: com.gocypher.cybench.plugin.Activator
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,
9-
com.gocypher.cybench.externals;bundle-version="1.0.0",
109
org.eclipse.jdt.launching;bundle-version="[3.18.0,4.0.0)",
1110
org.eclipse.ui.console;bundle-version="[3.9.300,4.0.0)",
1211
org.eclipse.e4.ui.workbench;bundle-version="[1.11.400,2.0.0)",
@@ -17,7 +16,8 @@ Require-Bundle: org.eclipse.ui,
1716
org.eclipse.ui.ide;bundle-version="[3.17.200,4.0.0)",
1817
org.eclipse.buildship.core;bundle-version="[3.1.4,4.0.0)",
1918
org.eclipse.m2e.jdt;bundle-version="[1.16.0,2.0.0)",
20-
org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)"
19+
org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)",
20+
com.gocypher.cybench.externals;bundle-version="1.0.1"
2121
Bundle-RequiredExecutionEnvironment: JavaSE-11
2222
Automatic-Module-Name: com.gocypher.cybench.plugin.tools
2323
Bundle-ActivationPolicy: lazy

com.gocypher.cybench.plugin.tools/src/com/gocypher/cybench/LauncherConfiguration.java

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,28 @@
2222
import java.util.LinkedHashSet;
2323
import java.util.Set;
2424

25+
import org.eclipse.swt.widgets.Button;
26+
2527
public class LauncherConfiguration {
2628

2729
private String reportName = "CyBench Report" ;
2830

2931
private String pathToPlainReportFile ;
3032
private String pathToEncryptedReportFile ;
3133

34+
35+
private int latestReports;
36+
private int anomaliesAllowed;
37+
private double percentChange;
38+
private double deviationsAllowed;
39+
40+
private String method = "";
41+
private String threshold = "";
42+
private String compareVersion = "";
43+
private String scope = "";
44+
45+
private boolean runAutoComparison;
46+
3247
private int forks = 1 ;
3348
private int measurementIterations = 1 ;
3449
private int warmUpIterations = 1 ;
@@ -256,4 +271,76 @@ public String getEmailAddress() {
256271
public void setEmailAddress(String emailAddress) {
257272
this.emailAddress = emailAddress;
258273
}
274+
275+
public int getLatestReports() {
276+
return latestReports;
277+
}
278+
279+
public void setLatestReports(int latestReports) {
280+
this.latestReports = latestReports;
281+
}
282+
283+
public int getAnomaliesAllowed() {
284+
return anomaliesAllowed;
285+
}
286+
287+
public void setAnomaliesAllowed(int anomaliesAllowed) {
288+
this.anomaliesAllowed = anomaliesAllowed;
289+
}
290+
291+
public double getPercentChange() {
292+
return percentChange;
293+
}
294+
295+
public void setPercentChange(double percentChange) {
296+
this.percentChange = percentChange;
297+
}
298+
299+
public double getDeviationsAllowed() {
300+
return deviationsAllowed;
301+
}
302+
303+
public void setDeviationsAllowed(double deviationsAllowed) {
304+
this.deviationsAllowed = deviationsAllowed;
305+
}
306+
307+
public String getMethod() {
308+
return method;
309+
}
310+
311+
public void setMethod(String method) {
312+
this.method = method;
313+
}
314+
315+
public String getThreshold() {
316+
return threshold;
317+
}
318+
319+
public void setThreshold(String threshold) {
320+
this.threshold = threshold;
321+
}
322+
323+
public String getCompareVersion() {
324+
return compareVersion;
325+
}
326+
327+
public void setCompareVersion(String compareVersion) {
328+
this.compareVersion = compareVersion;
329+
}
330+
public String getScope() {
331+
return scope;
332+
}
333+
334+
public void setScope(String scope) {
335+
this.scope = scope;
336+
}
337+
338+
public boolean isRunAutoComparison() {
339+
return runAutoComparison;
340+
}
341+
342+
public void setRunAutoComparison(boolean runAutoComparison) {
343+
this.runAutoComparison = runAutoComparison;
344+
}
345+
259346
}

0 commit comments

Comments
 (0)