diff --git a/org.aminb.alloy.catalyst.dist/.classpath b/org.shemshak.alloy.catalyst.dist/.classpath similarity index 100% rename from org.aminb.alloy.catalyst.dist/.classpath rename to org.shemshak.alloy.catalyst.dist/.classpath diff --git a/org.aminb.alloy.catalyst.dist/.gitignore b/org.shemshak.alloy.catalyst.dist/.gitignore similarity index 100% rename from org.aminb.alloy.catalyst.dist/.gitignore rename to org.shemshak.alloy.catalyst.dist/.gitignore diff --git a/org.aminb.alloy.catalyst.dist/.project b/org.shemshak.alloy.catalyst.dist/.project similarity index 91% rename from org.aminb.alloy.catalyst.dist/.project rename to org.shemshak.alloy.catalyst.dist/.project index acdf6b570bd42b8d1d69aae4288a692ffec11d66..3f8ee63ffa9b0c2a9f7785cdd023e919c09eba3c 100644 --- a/org.aminb.alloy.catalyst.dist/.project +++ b/org.shemshak.alloy.catalyst.dist/.project @@ -1,6 +1,6 @@ - org.aminb.alloy.catalyst.dist + org.shemshak.alloy.catalyst.dist diff --git a/org.aminb.alloy.catalyst.dist/.settings/org.eclipse.core.resources.prefs b/org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.aminb.alloy.catalyst.dist/.settings/org.eclipse.core.resources.prefs rename to org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.core.resources.prefs diff --git a/org.aminb.alloy.catalyst.dist/.settings/org.eclipse.core.runtime.prefs b/org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.aminb.alloy.catalyst.dist/.settings/org.eclipse.core.runtime.prefs rename to org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.core.runtime.prefs diff --git a/org.aminb.alloy.catalyst.dist/.settings/org.eclipse.jdt.core.prefs b/org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.aminb.alloy.catalyst.dist/.settings/org.eclipse.jdt.core.prefs rename to org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.jdt.core.prefs diff --git a/org.aminb.alloy.catalyst.dist/.settings/org.eclipse.jdt.ui.prefs b/org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.aminb.alloy.catalyst.dist/.settings/org.eclipse.jdt.ui.prefs rename to org.shemshak.alloy.catalyst.dist/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/Alloy.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/Alloy.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/Alloy.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/Alloy.txt diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/Catalyst.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/Catalyst.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/Catalyst.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/Catalyst.txt diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/JavaCup.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/JavaCup.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/JavaCup.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/JavaCup.txt diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/Kodkod.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/Kodkod.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/Kodkod.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/Kodkod.txt diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/MiniSat.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/MiniSat.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/MiniSat.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/MiniSat.txt diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/SAT4J.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/SAT4J.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/SAT4J.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/SAT4J.txt diff --git a/org.aminb.alloy.catalyst.dist/LICENSES/ZChaff.txt b/org.shemshak.alloy.catalyst.dist/LICENSES/ZChaff.txt similarity index 100% rename from org.aminb.alloy.catalyst.dist/LICENSES/ZChaff.txt rename to org.shemshak.alloy.catalyst.dist/LICENSES/ZChaff.txt diff --git a/org.aminb.alloy.catalyst.dist/bnd.bnd b/org.shemshak.alloy.catalyst.dist/bnd.bnd similarity index 88% rename from org.aminb.alloy.catalyst.dist/bnd.bnd rename to org.shemshak.alloy.catalyst.dist/bnd.bnd index 9984b2481b5e10144fd3531d40d3204350eae874..eef7fbf8b391bc1ea506a7719f21b21b18894296 100644 --- a/org.aminb.alloy.catalyst.dist/bnd.bnd +++ b/org.shemshak.alloy.catalyst.dist/bnd.bnd @@ -1,8 +1,8 @@ -Main-Class: org.aminb.alloy.catalyst.MainCLI +Main-Class: org.shemshak.alloy.catalyst.MainCLI -buildpath: \ - org.aminb.alloy.catalyst,\ + org.shemshak.alloy.catalyst,\ org.alloytools.alloy.core,\ org.alloytools.kodkod.core;version=latest,\ org.alloytools.kodkod.nativesat.x86-windows;version=latest,\ @@ -14,7 +14,7 @@ Main-Class: org.aminb.alloy.catalyst.MainCLI -sources: false -includeresource: \ - @${repo;org.aminb.alloy.catalyst}, \ + @${repo;org.shemshak.alloy.catalyst}, \ @${repo;org.alloytools.alloy.core}, \ @${repo;org.alloytools.kodkod.core}, \ @${repo;org.alloytools.kodkod.nativesat.util}, \ diff --git a/org.aminb.alloy.catalyst.dist/src/main/java/.gitignore b/org.shemshak.alloy.catalyst.dist/src/main/java/.gitignore similarity index 100% rename from org.aminb.alloy.catalyst.dist/src/main/java/.gitignore rename to org.shemshak.alloy.catalyst.dist/src/main/java/.gitignore diff --git a/org.aminb.alloy.catalyst.dist/src/test/java/.gitignore b/org.shemshak.alloy.catalyst.dist/src/test/java/.gitignore similarity index 100% rename from org.aminb.alloy.catalyst.dist/src/test/java/.gitignore rename to org.shemshak.alloy.catalyst.dist/src/test/java/.gitignore diff --git a/org.aminb.alloy.catalyst/.classpath b/org.shemshak.alloy.catalyst/.classpath similarity index 100% rename from org.aminb.alloy.catalyst/.classpath rename to org.shemshak.alloy.catalyst/.classpath diff --git a/org.aminb.alloy.catalyst/.eclim b/org.shemshak.alloy.catalyst/.eclim similarity index 100% rename from org.aminb.alloy.catalyst/.eclim rename to org.shemshak.alloy.catalyst/.eclim diff --git a/org.aminb.alloy.catalyst/.gitignore b/org.shemshak.alloy.catalyst/.gitignore similarity index 100% rename from org.aminb.alloy.catalyst/.gitignore rename to org.shemshak.alloy.catalyst/.gitignore diff --git a/org.aminb.alloy.catalyst/.project b/org.shemshak.alloy.catalyst/.project similarity index 92% rename from org.aminb.alloy.catalyst/.project rename to org.shemshak.alloy.catalyst/.project index 9fbe3b0afeeb7044c7951ceeb79b320acfd74acd..561e82ae1577b3430d1443c7c6795ba2804dea21 100644 --- a/org.aminb.alloy.catalyst/.project +++ b/org.shemshak.alloy.catalyst/.project @@ -1,6 +1,6 @@ - org.aminb.alloy.catalyst + org.shemshak.alloy.catalyst diff --git a/org.aminb.alloy.catalyst/.settings/org.eclipse.core.resources.prefs b/org.shemshak.alloy.catalyst/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.aminb.alloy.catalyst/.settings/org.eclipse.core.resources.prefs rename to org.shemshak.alloy.catalyst/.settings/org.eclipse.core.resources.prefs diff --git a/org.aminb.alloy.catalyst/.settings/org.eclipse.core.runtime.prefs b/org.shemshak.alloy.catalyst/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.aminb.alloy.catalyst/.settings/org.eclipse.core.runtime.prefs rename to org.shemshak.alloy.catalyst/.settings/org.eclipse.core.runtime.prefs diff --git a/org.aminb.alloy.catalyst/.settings/org.eclipse.jdt.core.prefs b/org.shemshak.alloy.catalyst/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.aminb.alloy.catalyst/.settings/org.eclipse.jdt.core.prefs rename to org.shemshak.alloy.catalyst/.settings/org.eclipse.jdt.core.prefs diff --git a/org.aminb.alloy.catalyst/.settings/org.eclipse.jdt.ui.prefs b/org.shemshak.alloy.catalyst/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.aminb.alloy.catalyst/.settings/org.eclipse.jdt.ui.prefs rename to org.shemshak.alloy.catalyst/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.aminb.alloy.catalyst/bnd.bnd b/org.shemshak.alloy.catalyst/bnd.bnd similarity index 88% rename from org.aminb.alloy.catalyst/bnd.bnd rename to org.shemshak.alloy.catalyst/bnd.bnd index 0ae526276170fa80b06774323e143461b1e5431e..91d458f0e45ec08bc6a31c8b995046d474077920 100644 --- a/org.aminb.alloy.catalyst/bnd.bnd +++ b/org.shemshak.alloy.catalyst/bnd.bnd @@ -1,4 +1,4 @@ -Main-Class: org.aminb.alloy.catalyst.MainCLI +Main-Class: org.shemshak.alloy.catalyst.MainCLI -buildpath: \ org.alloytools.alloy.core;version=latest,\ @@ -15,5 +15,5 @@ Main-Class: org.aminb.alloy.catalyst.MainCLI com.google.gson Private-Package: \ - org.aminb.alloy.catalyst,\ + org.shemshak.alloy.catalyst,\ kodkod.engine.satlab;-split-package:=merge-first diff --git a/org.aminb.alloy.catalyst/doc/catalyst.org b/org.shemshak.alloy.catalyst/doc/catalyst.org similarity index 100% rename from org.aminb.alloy.catalyst/doc/catalyst.org rename to org.shemshak.alloy.catalyst/doc/catalyst.org diff --git a/org.aminb.alloy.catalyst/src/main/java/kodkod/engine/satlab/InitSolvers.java b/org.shemshak.alloy.catalyst/src/main/java/kodkod/engine/satlab/InitSolvers.java similarity index 100% rename from org.aminb.alloy.catalyst/src/main/java/kodkod/engine/satlab/InitSolvers.java rename to org.shemshak.alloy.catalyst/src/main/java/kodkod/engine/satlab/InitSolvers.java diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/CatalystCommand.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/CatalystCommand.java similarity index 99% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/CatalystCommand.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/CatalystCommand.java index 1ac430a67d58aaffc514c0830ceaeae9e1644b92..997aa3ecb49571baa6ec0bb3227c239a00572d9c 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/CatalystCommand.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/CatalystCommand.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import java.io.BufferedWriter; import java.io.FileNotFoundException; diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/GitHubAlloyCLI.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/GitHubAlloyCLI.java similarity index 98% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/GitHubAlloyCLI.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/GitHubAlloyCLI.java index def8b2ac00f2fdec6972062cee98c5a92fea9f17..92a555b025d574a2b63f04f80df524a39662e143 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/GitHubAlloyCLI.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/GitHubAlloyCLI.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import org.apache.commons.codec.digest.DigestUtils; import org.kohsuke.github.GHRepository; diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Item.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Item.java similarity index 97% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Item.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Item.java index 7cac560cff712348789fdd2d799c5f8ccb7fa21a..a03013e57937723e2c00e19a0ee0b0f3581a252f 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Item.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Item.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import edu.mit.csail.sdg.ast.Expr; import edu.mit.csail.sdg.ast.Func; diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/MainCLI.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/MainCLI.java similarity index 90% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/MainCLI.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/MainCLI.java index 06c227468d0515a940c7c7e0fed871b2e33ad57a..ef9ae8915b8638b8601b5c9d6be9f422b76a5e50 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/MainCLI.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/MainCLI.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import picocli.CommandLine; import picocli.CommandLine.Command; @@ -13,7 +13,7 @@ import picocli.CommandLine.Command; "Catalyst is free software: you are free to change and redistribute it.", "There is NO WARRANTY, to the extent permitted by law.", "", - "Written by Amin Bandali." + "Written by Amin Bandali ." }, description = "A framework for analysis/optimization of performance of Alloy models.", customSynopsis = "@|bold catalyst|@ [OPTION] COMMAND", diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Mut.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Mut.java similarity index 99% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Mut.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Mut.java index ec2aba3e5fc04930f4bf6ae157d1cd32da24d198..c143fa51446a4163812f927bc5376a1f047da346 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Mut.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Mut.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import java.io.IOException; import java.io.Writer; diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Result.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Result.java similarity index 97% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Result.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Result.java index e80f84941af6acb64981bd9dcfdfd90597a25169..8f4a7dde07283716b9df66fc373bacf8632a609c 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Result.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Result.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import java.util.List; diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/SSR.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/SSR.java similarity index 93% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/SSR.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/SSR.java index 2f7e14d06c3554ebf52af52fb9dbc5e78b378757..e2d6d5ce540244d094f395689f33c3018703a9ba 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/SSR.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/SSR.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import java.io.File; import java.io.IOException; @@ -10,8 +10,6 @@ import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashMap; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -71,9 +69,6 @@ public final class SSR extends CatalystCommand implements Runnable { protected final CorpusResult analyzeCorpus(String corpus) { CorpusResult cr = new CorpusResult(); cr.corpus_name = corpus; - cr.file_results = parallel ? - Collections.synchronizedList(new ArrayList()) : - new ArrayList(); pln(); @@ -81,15 +76,17 @@ public final class SSR extends CatalystCommand implements Runnable { try { List files = Files.walk(Paths.get(modelsDir, corpus)) .filter(Files::isRegularFile) + .filter(p -> p.getFileName().toString().endsWith(".als")) + .filter(p -> !Arrays.asList(ignoredFiles).contains(p.getFileName().toString())) .collect(Collectors.toList()); cr.file_count = files.size(); pln("number of " + corpus + " models: " + cr.file_count); r.total_file_count += cr.file_count; AtomicInteger i = new AtomicInteger(1); Stream fs = parallel ? files.parallelStream() : files.stream(); - fs.filter(p -> p.getFileName().toString().endsWith(".als")) - .filter(p -> !Arrays.asList(ignoredFiles).contains(p.getFileName().toString())) - .forEach(p -> cr.file_results.add(analyzeFile(corpus, p, i.getAndIncrement(), cr.file_count))); + cr.file_results = + fs.map(p -> analyzeFile(corpus, p, i.getAndIncrement(), cr.file_count)) + .collect(Collectors.toList()); } catch (Exception e) { String msg = "Failed while trying to iterate through and analyze " + corpus + " models."; cr.error = String.format("%s%n%s", msg, Utils.toString(e)); @@ -125,7 +122,6 @@ public final class SSR extends CatalystCommand implements Runnable { protected final FileResult analyzeFile(String corpus, Path p, int index, int total) { FileResult fr = new FileResult(); fr.file_name = p.toString(); - fr.mutation_results = new ArrayList(); fr.errors = new ArrayList(); String progress = String.format("[%d/%d]: ", index, total); diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/SSRVisitor.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/SSRVisitor.java similarity index 99% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/SSRVisitor.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/SSRVisitor.java index d6a36fd51356ee8c777c561e1d1dc54937d7e236..53227d30611ecebf5c78d638950451d191ffcb94 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/SSRVisitor.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/SSRVisitor.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import java.util.Arrays; import java.util.HashSet; diff --git a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Utils.java b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Utils.java similarity index 98% rename from org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Utils.java rename to org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Utils.java index fb0ca3c179bc5cb66ab97e066b138c1d88fe59e2..265b75a633c3cb24254526702ef6636562028c42 100644 --- a/org.aminb.alloy.catalyst/src/main/java/org/aminb/alloy/catalyst/Utils.java +++ b/org.shemshak.alloy.catalyst/src/main/java/org/shemshak/alloy/catalyst/Utils.java @@ -1,4 +1,4 @@ -package org.aminb.alloy.catalyst; +package org.shemshak.alloy.catalyst; import java.io.File; import java.nio.file.Path; diff --git a/org.aminb.alloy.catalyst/src/test/java/.gitkeep b/org.shemshak.alloy.catalyst/src/test/java/.gitkeep similarity index 100% rename from org.aminb.alloy.catalyst/src/test/java/.gitkeep rename to org.shemshak.alloy.catalyst/src/test/java/.gitkeep