Skip to content

Commit

Permalink
Attempting to fix tarsosdsp errors, and fix actions
Browse files Browse the repository at this point in the history
  • Loading branch information
smaybius committed May 22, 2024
1 parent 17d1d93 commit 0b6295f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: 8
java-version: 17
distribution: zulu
- name: Run checkstyle with Maven
run: mvn -Dcheckstyle.violationSeverity=warning checkstyle:check
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
strategy:
matrix:
# Use these Java versions
java: [8, 11, 17, 21]
java: [17, 21]
# and run on both Linux and Windows
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
Expand Down
12 changes: 6 additions & 6 deletions ShowcaseOneSort.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.github.arrayv.utils.Delays
def shuffles = arrayv.arrayManager.shuffles
def distributions = arrayv.arrayManager.distributions
//Warning: With this current code, this script will run as soon as ArrayV is loaded if it's in the scripts/ folder.
runGroup(shuffles.size() + distributions.size()) { // The number of inputs will be shown in the UI as the length of the shuffles plus the length of the distributions.
runGroup(shuffles.size() + distributions.size() + 1) { // The number of inputs will be shown in the UI as the length of the shuffles plus the length of the distributions.
for (shuffle in shuffles) { // Iterate through shuffles and distributions instead of manually listing each of them.
if (shuffle != Shuffles.ALREADY) { // Exclude the "no shuffle" shuffle, for being redundant with "sorted".
category = shuffle.name
Expand All @@ -16,20 +16,20 @@ runGroup(shuffles.size() + distributions.size()) { // The number of inputs will
} else {
arrayv.arrayManager.setShuffleSingle(shuffle)
}
run PipoSort go 2048.numbers
run PatienceSort go 2048.numbers
} else {
arrayv.setUniqueItems(64)
category = "Few Uniques (64)"
arrayv.arrayManager.setShuffleSingle(Shuffles.RANDOM)
run PipoSort go 2048.numbers
run PatienceSort go 2048.numbers
category = "Few Uniques (32)"
arrayv.setUniqueItems(32)
arrayv.arrayManager.setShuffleSingle(Shuffles.RANDOM)
run PipoSort go 2048.numbers
run PatienceSort go 2048.numbers
category = "Few Uniques (16)"
arrayv.setUniqueItems(16)
arrayv.arrayManager.setShuffleSingle(Shuffles.RANDOM)
run PipoSort go 2048.numbers
run PatienceSort go 2048.numbers
arrayv.setUniqueItems(2048)
}

Expand All @@ -43,7 +43,7 @@ runGroup(shuffles.size() + distributions.size()) { // The number of inputs will
} else {
arrayv.arrayManager.setShuffleSingle(distrib)
}
run PipoSort go 2048.numbers
run PatienceSort go 2048.numbers
}
if (distrib == Distributions.CUSTOM)
return;
Expand Down
1 change: 1 addition & 0 deletions run
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
./mvnw dependency:resolve
./mvnw dependency:build-classpath -Dmdep.outputFile=target/classpath -Dmdep.regenerateFile=true -q
echo -n -cp target/classes:> target/cmdargs
cat target/classpath >> target/cmdargs
Expand Down
1 change: 1 addition & 0 deletions run.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@echo off
call mvnw dependency:resolve
call mvnw dependency:build-classpath -Dmdep.outputFile=target\classpath -Dmdep.regenerateFile=true -q
<NUL set /p=-cp target\classes;> target\cmdargs
type target\classpath >> target\cmdargs
Expand Down

0 comments on commit 0b6295f

Please sign in to comment.