Commit d3db0f83 authored by Tobias Meggendorfer's avatar Tobias Meggendorfer

Bump version

parent 9c953acb
......@@ -26,7 +26,7 @@ Build:
script:
- java -version
- ./gradlew -b plugins.gradle
- ./gradlew check minimizedDistZip
- ./gradlew -b build.gradle check minimizedDistZip
- unzip -d build/unzipped build/distributions/*.zip
- scripts/check_binaries.sh build/unzipped/owl-*/bin
artifacts:
......@@ -52,7 +52,7 @@ Assemble:
- $GRADLE
script:
- ./gradlew -b plugins.gradle
- ./gradlew distZip javadoc
- ./gradlew -b build.gradle distZip javadoc
dependencies:
- Build
artifacts:
......@@ -103,7 +103,7 @@ Size Regression Test:
- $GRADLE
script:
- ./gradlew -b plugins.gradle
- ./gradlew sizeRegressionTest
- ./gradlew -b build.gradle sizeRegressionTest
dependencies:
- Build
artifacts:
......@@ -120,7 +120,7 @@ Size Regression Train:
- $GRADLE
script:
- ./gradlew -b plugins.gradle
- ./gradlew sizeRegressionTrain
- ./gradlew -b build.gradle sizeRegressionTrain
when: manual
dependencies:
- Build
......
This diff is collapsed.
......@@ -63,7 +63,7 @@
</module>
<module name="RightCurly">
<property name="id" value="RightCurlyAlone"/>
<property name="option" value="alone"/>
<property name="option" value="alone_or_singleline"/>
<property name="tokens"
value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
</module>
......
......@@ -21,7 +21,7 @@
// https://docs.gradle.org/current/dsl/org.gradle.api.plugins.quality.Pmd.html
pmd {
toolVersion = "6.7.0" // https://pmd.github.io/
toolVersion = "6.15.0" // https://pmd.github.io/
reportsDir = file("$project.buildDir/reports/pmd")
ruleSetFiles = files("$project.rootDir/config/pmd-rules.xml")
ruleSets = [] // We specify all rules in rules.xml
......@@ -40,7 +40,7 @@ tasks.withType(Pmd) {
// https://docs.gradle.org/current/dsl/org.gradle.api.plugins.quality.Checkstyle.html
checkstyle {
toolVersion = "8.12" // http://checkstyle.sourceforge.net/releasenotes.html
toolVersion = "8.21" // http://checkstyle.sourceforge.net/releasenotes.html
configFile = file("$project.rootDir/config/checkstyle.xml")
ignoreFailures = false
maxWarnings = 0
......
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionSha256Sum=7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
......@@ -44,17 +44,15 @@ repositories {
}
dependencies {
implementation 'net.ltgt.gradle:gradle-apt-plugin:0.18'
implementation 'net.ltgt.gradle:gradle-errorprone-plugin:0.6'
implementation 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
implementation 'net.ltgt.gradle:gradle-errorprone-plugin:0.8.1'
implementation 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
}
dependencyVerification {
verify = [
'com.github.jengelman.gradle.plugins:shadow:4.0.2:shadow-4.0.2.jar:4967d962a93ab297207cd61619d5000e4b1f0c1f26c9e559add5213db0263773',
'com.github.jengelman.gradle.plugins:shadow:5.0.0:shadow-5.0.0.jar:73e8d677735e7fd5a63b9ab0c5d60b72fe784b118a9e546a20aee4712312e548',
'commons-io:commons-io:2.6:commons-io-2.6.jar:f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513',
'net.ltgt.gradle:gradle-apt-plugin:0.18:gradle-apt-plugin-0.18.jar:d3a350a115bba6bdaa8230ce80ece6cef32c347ffd1b76c5514003f504424d0f',
'net.ltgt.gradle:gradle-errorprone-plugin:0.6:gradle-errorprone-plugin-0.6.jar:ef38e95e575d5fbc84d8b3dd2d6a44bd750d833cdfc18335cc3a633b83e15c6e',
'net.ltgt.gradle:gradle-errorprone-plugin:0.8.1:gradle-errorprone-plugin-0.8.1.jar:0524b841630b880b8aeb503e8aef7e47dbaef2d3707c9ce5445b903fd938e979',
'org.apache.ant:ant-launcher:1.9.7:ant-launcher-1.9.7.jar:bc376f6d6cb586229f451ac459faf1443b144c26d6647618ec9cba60e54c2b79',
'org.apache.ant:ant:1.9.7:ant-1.9.7.jar:9a5dbe3f5f2cb91854c8682cab80178afa412ab35a5ab718bf39ce01b3435d93',
'org.apache.logging.log4j:log4j-api:2.11.0:log4j-api-2.11.0.jar:fa5828950269b0ae425c96d889f18f40b336e9fa886841ae06bb9225511f1217',
......
......@@ -30,15 +30,13 @@ import owl.factories.FactorySupplier;
import owl.factories.ValuationSetFactory;
public final class JBddSupplier implements FactorySupplier {
private static final JBddSupplier PLAIN = new JBddSupplier(false, false);
private static final JBddSupplier ANNOTATED = new JBddSupplier(true, false);
private static final JBddSupplier PLAIN = new JBddSupplier(false);
private static final JBddSupplier ANNOTATED = new JBddSupplier(true);
private final boolean keepRepresentativesDefault;
private final boolean sync;
private JBddSupplier(boolean keepRepresentativesDefault, boolean sync) {
private JBddSupplier(boolean keepRepresentativesDefault) {
this.keepRepresentativesDefault = keepRepresentativesDefault;
this.sync = sync;
}
public static FactorySupplier async(boolean keepRepresentativesDefault) {
......@@ -49,9 +47,7 @@ public final class JBddSupplier implements FactorySupplier {
BddConfiguration configuration = ImmutableBddConfiguration.builder()
.logStatisticsOnShutdown(false)
.build();
return sync
? BddFactory.buildSynchronizedBdd(size, configuration)
: BddFactory.buildBdd(size, configuration);
return BddFactory.buildBdd(size, configuration);
}
@Override
......
......@@ -30,7 +30,7 @@ public final class DeduplicationRewriter implements Visitor<Formula> {
}
private Formula computeIfAbsent(Formula formula, Supplier<Formula> supplier) {
private Formula computeIfAbsent(Formula formula, Supplier<Formula> supplier) { // NOPMD
// Can't use map.computeIfAbsent due to recursive calls; supplier.get() might modify the map
Formula value = map.get(formula);
if (value != null) {
......
......@@ -123,7 +123,7 @@ public class LatexPrintVisitor implements Visitor<String> {
.collect(Collectors.joining(" \\" + operator.operatorSymbol() + ' '));
}
private String visit(PropositionalFormula propositionalFormula, String latexString) {
private String visit(PropositionalFormula propositionalFormula, String latexString) { // NOPMD
return propositionalFormula.children.stream()
.sorted(Comparator.naturalOrder())
.map(x -> {
......
......@@ -18,7 +18,7 @@
*/
/**
* This package and its subpackages contains various
* This package and its subpackages contains various things.
*/
@EverythingIsNonnullByDefault
package owl;
......
......@@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// CSOFF: JavadocParagraphCheck
/**
* This package (and it's sub-packages) contains a flexible infrastructure for executing various
* translation chains and obtaining these translation chains from the command line. Executions are
......@@ -80,10 +82,10 @@
* {@link owl.run.modules.OwlModuleRegistry registry} to be usable with the extended command line
* syntax. Also, a dedicated {@code main} method can be created by delegating to the
* {@link owl.run.parser.PartialConfigurationParser partial configuration parser}. See, e.g., the
* {@link owl.translations.modules.LTL2DGRAModule.RabinizerMain rabinizer main} for an example.
* {@link owl.translations.modules.LTL2DGRAModule rabinizer main} for an example.
*/
@EverythingIsNonnullByDefault
package owl.run;
// CSON: JavadocParagraphCheck
import owl.util.annotation.EverythingIsNonnullByDefault;
\ No newline at end of file
......@@ -163,8 +163,8 @@ public final class NonDeterministicConstructions {
return Set.of();
}
var finiteLtl = new HashSet<Formula>();
var nonFiniteLtl = new HashSet<Formula>();
var finiteLtl = new HashSet<Formula>(); // NOPMD
var nonFiniteLtl = new HashSet<Formula>(); // NOPMD
x.children.forEach(y -> {
if (IsLiteralOrXVisitor.INSTANCE.apply(x)) {
......
......@@ -222,7 +222,7 @@ public final class SymmetricLDBAConstruction<B extends GeneralizedBuchiAcceptanc
.map(Fixpoints::simplified)
.collect(Collectors.toSet());
var jumps = new ArrayList<SymmetricProductState>();
var jumps = new ArrayList<SymmetricProductState>(); // NOPMD
evaluationMap.forEach((fixpoints, set) -> {
if (!availableFixpoints.contains(fixpoints)) {
......
......@@ -92,7 +92,7 @@ public final class NBA2DPA implements Function<Automaton<?, ?>, Automaton<?, Par
RankingAutomaton(NBA2LDBA.LDBA<S> ldba) {
nba = ldba.automaton();
intialComponent = Set.copyOf(ldba.initialComponent());
greaterOrEqualCache = CacheBuilder.newBuilder().maximumSize(500000)
greaterOrEqualCache = CacheBuilder.newBuilder().maximumSize(500_000)
.expireAfterAccess(60, TimeUnit.SECONDS)
.build(new CacheLoader<>() {
@Override
......
......@@ -257,10 +257,11 @@ abstract class EquivalenceClassTest {
@Test
void testTruthness() {
assertEquals(1.0d, factory.getTrue().trueness(), 0.00000001d);
assertEquals(0.75d, factory.of(LtlParser.syntax("a | b")).trueness(), 0.00000001d);
assertEquals(0.5d, factory.of(LtlParser.syntax("a")).trueness(), 0.00000001d);
assertEquals(0.25d, factory.of(LtlParser.syntax("a & b")).trueness(), 0.00000001d);
assertEquals(0.0d, factory.getFalse().trueness(), 0.00000001d);
double precision = 0.000_000_01d;
assertEquals(1.0d, factory.getTrue().trueness(), precision);
assertEquals(0.75d, factory.of(LtlParser.syntax("a | b")).trueness(), precision);
assertEquals(0.5d, factory.of(LtlParser.syntax("a")).trueness(), precision);
assertEquals(0.25d, factory.of(LtlParser.syntax("a & b")).trueness(), precision);
assertEquals(0.0d, factory.getFalse().trueness(), precision);
}
}
......@@ -696,7 +696,8 @@ class TranslationAutomatonSummaryTest {
for (int row = 0; row < rows; row++) {
if (row % 2 == 0 && !interestingRow.test(row)) {
row = row + 1;
//noinspection AssignmentToForLoopParameter
row += 1; // NOPMD
continue;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment