diff --git a/H07/.editorconfig b/H07/.editorconfig new file mode 100644 index 0000000..38866d3 --- /dev/null +++ b/H07/.editorconfig @@ -0,0 +1,12 @@ +# Editor configuration, see https://editorconfig.org + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 4 +insert_final_newline = true +trim_trailing_whitespace = true + +[{*.yml,*.json}] +indent_size = 2 diff --git a/H07/.gitignore b/H07/.gitignore new file mode 100644 index 0000000..e3750f8 --- /dev/null +++ b/H07/.gitignore @@ -0,0 +1,86 @@ +### Intellij ### +.idea/ +*.iws +/out/ +*.iml +.idea_modules/ +atlassian-ide-plugin.xml + +### VS-Code ### +.vscode/ +.VSCodeCounter/ + +### Eclipse ### +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders +.externalToolBuilders/ +*.launch +.factorypath +.recommenders/ +.apt_generated/ +.project +.classpath + +### Linux ### +*~ +.fuse_hidden* +.directory +.Trash-* +.nfs* + +### macOS ### +.DS_Store +.AppleDouble +.LSOverride +Icon +._* +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db +*.stackdump +[Dd]esktop.ini +$RECYCLE.BIN/ +*.lnk + +### Gradle ### +.gradle +/build/ +out/ +gradle-app.setting +!gradle-wrapper.jar +.gradletasknamecache + +*.hprof +jagr.conf diff --git a/H07/README.md b/H07/README.md new file mode 100644 index 0000000..fc2f4da --- /dev/null +++ b/H07/README.md @@ -0,0 +1,4 @@ +# Vorlage zu Hausübung 07 + +Beachten Sie die Hinweise zum Herunterladen, Importieren, Bearbeitern, Exportieren und Hochladen in unserem +[Studierenden-Guide](https://wiki.tudalgo.org/) diff --git a/H07/build.gradle.kts b/H07/build.gradle.kts new file mode 100644 index 0000000..d22a930 --- /dev/null +++ b/H07/build.gradle.kts @@ -0,0 +1,33 @@ +import org.sourcegrade.jagr.gradle.task.grader.GraderRunTask + +plugins { + alias(libs.plugins.algomate) +} + +exercise { + assignmentId.set("h07") +} + +submission { + // ACHTUNG! + // Setzen Sie im folgenden Bereich Ihre TU-ID (NICHT Ihre Matrikelnummer!), Ihren Nachnamen und Ihren Vornamen + // in Anführungszeichen (z.B. "ab12cdef" für Ihre TU-ID) ein! + // BEISPIEL: + // studentId = "ab12cdef" + // firstName = "sol_first" + // lastName = "sol_last" + studentId = "" + firstName = "" + lastName = "" + + // Optionally require own tests for mainBuildSubmission task. Default is false + requireTests = false +} + +tasks { + withType { + doFirst { + throw GradleException("No public tests are provided for this exercise! For more information go to https://moodle.informatik.tu-darmstadt.de/mod/page/view.php?id=68766") + } + } +} diff --git a/H07/gradle/libs.versions.toml b/H07/gradle/libs.versions.toml new file mode 100644 index 0000000..46d58d4 --- /dev/null +++ b/H07/gradle/libs.versions.toml @@ -0,0 +1,2 @@ +[plugins] +algomate = { id = "org.tudalgo.algomate", version = "0.7.1" } diff --git a/H07/gradle/wrapper/gradle-wrapper.jar b/H07/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/H07/gradle/wrapper/gradle-wrapper.jar differ diff --git a/H07/gradle/wrapper/gradle-wrapper.properties b/H07/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..79eb9d0 --- /dev/null +++ b/H07/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/H07/gradlew b/H07/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/H07/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/H07/gradlew.bat b/H07/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/H07/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/H07/settings.gradle.kts b/H07/settings.gradle.kts new file mode 100644 index 0000000..68797bc --- /dev/null +++ b/H07/settings.gradle.kts @@ -0,0 +1,11 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { +// mavenLocal() + maven("https://s01.oss.sonatype.org/content/repositories/snapshots") + maven("https://jitpack.io") + mavenCentral() + } +} + +rootProject.name = "H07-Student" diff --git a/H07/src/main/java/h07/Main.java b/H07/src/main/java/h07/Main.java new file mode 100644 index 0000000..4a57760 --- /dev/null +++ b/H07/src/main/java/h07/Main.java @@ -0,0 +1,66 @@ +package h07; + +import org.tudalgo.algoutils.student.annotation.DoNotTouch; +import org.tudalgo.algoutils.student.annotation.StudentImplementationRequired; + +import h07.peano.NaturalNumber; +import h07.peano.Successor; +import h07.peano.Zero; + +import static org.tudalgo.algoutils.student.Student.crash; + +/** + * Main entry point in executing the program. + */ +public class Main { + /** + * Main entry point in executing the program. + * + * @param args program arguments, currently ignored + */ + public static void main(String[] args) { + testHeader("Multiplication Table"); + numberExpressionMultiplicationTableTests(); + + testHeader("Peano Number Expressions"); + peanoNumberExpressionTests(); + + testHeader("Filter, Fold, Map"); + filterFoldMapTests(); + } + + @DoNotTouch + private static void testHeader(String testName) { + System.out.println("-----------------------------------"); + System.out.println("Running test: " + testName); + System.out.println("-----------------------------------"); + } + + @DoNotTouch + private static void numberExpressionMultiplicationTableTests() { + // TODO: H2.2 - uncomment to test +// int lowerBound = 1; +// int upperBound = 10; +// NumberExpression[] multiplicationTable = NumberExpressionFactory.multiplicationTable(lowerBound, upperBound); +// +// for (int i = lowerBound; i <= upperBound; i++) { +// for (int j = lowerBound; j <= upperBound; j++) { +// System.out.printf("| %4s ", multiplicationTable[(i - lowerBound) * (upperBound - lowerBound + 1) + (j - lowerBound)].evaluate()); +// } +// System.out.println("|"); +// } + } + + private static final NaturalNumber THREE = new Successor(new Successor(new Successor(new Zero()))); + private static final NaturalNumber SEVEN = new Successor(new Successor(new Successor(new Successor(new Successor(new Successor(new Successor(new Zero()))))))); + + @StudentImplementationRequired + private static void peanoNumberExpressionTests() { + crash(); // TODO: H3.3 - remove if implemented + } + + @StudentImplementationRequired + private static void filterFoldMapTests() { + crash(); // TODO: H4.6 - remove if implemented + } +} diff --git a/H07/src/main/java/h07/NumberExpressionFactory.java b/H07/src/main/java/h07/NumberExpressionFactory.java new file mode 100644 index 0000000..f2bb270 --- /dev/null +++ b/H07/src/main/java/h07/NumberExpressionFactory.java @@ -0,0 +1,65 @@ +package h07; + +import java.util.function.IntPredicate; + +import org.tudalgo.algoutils.student.annotation.DoNotTouch; +import org.tudalgo.algoutils.student.annotation.StudentImplementationRequired; + +import static org.tudalgo.algoutils.student.Student.crash; + +/** + * A factory class for creating number expressions. + */ +public class NumberExpressionFactory { + /** + * Calculates the product of all possible pairs of numbers in the given array. + * + * @param numbers the array of number expressions to calculate the multiplication table + * @return An array of number expressions representing the result of the + * multiplication table of the given numbers. + */ +// @StudentImplementationRequired +// public static NumberExpression[] multiplicationTable(NumberExpression[] numbers) { +// return crash(); // TODO: H2.1 - remove if implemented +// } + + + // TODO: H2.2 - uncomment for testing + /** + * Calculates the product of all possible pairs of numbers in the given range. + * + * @param lowerBound the lower bound of the multiplication table, inclusive + * @param upperBound the upper bound of the multiplication table, inclusive + * @return An array of number expressions representing the result of the + * multiplication table of the numbers from lowerBound to upperBound. + */ +// @DoNotTouch +// public static NumberExpression[] multiplicationTable(int lowerBound, int upperBound) { +// int numberOfNumbers = upperBound - lowerBound + 1; +// NumberExpression[] baseNumbers = new NumberExpression[numberOfNumbers]; +// +// for (int i = lowerBound; i <= upperBound; i++) { +// // Copy to local variable to make it effectively final, so it can be used in +// // lambda +// int finalI = i; +// baseNumbers[i - lowerBound] = () -> finalI; +// } +// +// return multiplicationTable(baseNumbers); +// } + + /** + * Filters the given array of number expressions based on the given predicate. + * The returned array should contain only the number expressions that satisfy + * the predicate in the same order as they appear in the input array. + * This means there should be no null values in the returned array. + * + * @param numbers the array of number expressions to filter + * @param predicate the predicate to filter the number expressions + * @return An array of number expressions that satisfy the predicate. + */ +// @StudentImplementationRequired +// public static NumberExpression[] filter(NumberExpression[] numbers, IntPredicate predicate) { +// return crash(); // TODO: H4.4 - remove if implemented +// } +} diff --git a/H07/src/main/java/h07/peano/NaturalNumber.java b/H07/src/main/java/h07/peano/NaturalNumber.java new file mode 100644 index 0000000..2575c74 --- /dev/null +++ b/H07/src/main/java/h07/peano/NaturalNumber.java @@ -0,0 +1,17 @@ +package h07.peano; + +import org.tudalgo.algoutils.student.annotation.DoNotTouch; + +/** + * Represents a natural number. + */ +@DoNotTouch +public abstract class NaturalNumber { + /** + * Returns the string representation of the natural number. + * + * @return the string representation of the natural number + */ + @Override + public abstract String toString(); +} diff --git a/H07/src/main/java/h07/peano/PeanoNumberExpressionFactory.java b/H07/src/main/java/h07/peano/PeanoNumberExpressionFactory.java new file mode 100644 index 0000000..753da6f --- /dev/null +++ b/H07/src/main/java/h07/peano/PeanoNumberExpressionFactory.java @@ -0,0 +1,35 @@ +package h07.peano; + + +import org.tudalgo.algoutils.student.annotation.StudentImplementationRequired; + +import static org.tudalgo.algoutils.student.Student.crash; + +/** + * Represents a factory for Peano number expressions. + */ +public class PeanoNumberExpressionFactory { + /** + * Converts an array of number expressions to an array of Peano number expressions. + * + * @param numberExpressions the number expressions to convert + * @return the converted Peano number expressions + */ +// @StudentImplementationRequired +// public static PeanoNumberExpression[] fromNumberExpressions(NumberExpression[] numberExpressions) { +// return crash(); // TODO: H4.3 - remove if implemented +// } + + /** + * Folds an array of Peano number expressions into a single Peano number expression. + * + * @param peanoNumberExpressions the Peano number expressions to fold + * @param initial the initial Peano number expression + * @param operation the operation to apply + * @return the folded Peano number expression + */ +// @StudentImplementationRequired +// public static PeanoNumberExpression fold(PeanoNumberExpression[] peanoNumberExpressions, PeanoNumberExpression initial, PeanoArithmeticExpression operation) { +// return crash(); // TODO: H4.5 - remove if implemented +// } +} diff --git a/H07/src/main/java/h07/peano/Successor.java b/H07/src/main/java/h07/peano/Successor.java new file mode 100644 index 0000000..261f24f --- /dev/null +++ b/H07/src/main/java/h07/peano/Successor.java @@ -0,0 +1,20 @@ +package h07.peano; + +import org.tudalgo.algoutils.student.annotation.DoNotTouch; + +/** + * Represents a successor of a natural number in Peano arithmetic. + */ +@DoNotTouch +public class Successor extends NaturalNumber { + public final NaturalNumber predecessor; + + public Successor(NaturalNumber predecessor) { + this.predecessor = predecessor; + } + + @Override + public String toString() { + return "S(" + predecessor.toString() + ")"; + } +} diff --git a/H07/src/main/java/h07/peano/Zero.java b/H07/src/main/java/h07/peano/Zero.java new file mode 100644 index 0000000..4aa12d9 --- /dev/null +++ b/H07/src/main/java/h07/peano/Zero.java @@ -0,0 +1,14 @@ +package h07.peano; + +import org.tudalgo.algoutils.student.annotation.DoNotTouch; + +/** + * Represents the number zero in Peano arithmetic. + */ +@DoNotTouch +public class Zero extends NaturalNumber { + @Override + public String toString() { + return "Z"; + } +} diff --git a/H07/src/test/java/h07/ExampleJUnitTest.java b/H07/src/test/java/h07/ExampleJUnitTest.java new file mode 100644 index 0000000..0dd0ee9 --- /dev/null +++ b/H07/src/test/java/h07/ExampleJUnitTest.java @@ -0,0 +1,16 @@ +package h07; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * An example JUnit test class. + */ +public class ExampleJUnitTest { + + @Test + public void testAddition() { + assertEquals(2, 1 + 1); + } +} diff --git a/solution/H07/.gradle/8.10.2/checksums/checksums.lock b/solution/H07/.gradle/8.10.2/checksums/checksums.lock deleted file mode 100644 index 9e6dc30..0000000 Binary files a/solution/H07/.gradle/8.10.2/checksums/checksums.lock and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/checksums/md5-checksums.bin b/solution/H07/.gradle/8.10.2/checksums/md5-checksums.bin deleted file mode 100644 index 68f0365..0000000 Binary files a/solution/H07/.gradle/8.10.2/checksums/md5-checksums.bin and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/checksums/sha1-checksums.bin b/solution/H07/.gradle/8.10.2/checksums/sha1-checksums.bin deleted file mode 100644 index aa7e179..0000000 Binary files a/solution/H07/.gradle/8.10.2/checksums/sha1-checksums.bin and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$BundleAccessors.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$BundleAccessors.class deleted file mode 100644 index 9ca7e17..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$BundleAccessors.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$PluginAccessors.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$PluginAccessors.class deleted file mode 100644 index 126131c..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$PluginAccessors.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$VersionAccessors.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$VersionAccessors.class deleted file mode 100644 index 5d7fe22..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs$VersionAccessors.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs.class deleted file mode 100644 index 01a54ab..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibs.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$BundleAccessors.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$BundleAccessors.class deleted file mode 100644 index aabb2a3..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$BundleAccessors.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$PluginAccessors.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$PluginAccessors.class deleted file mode 100644 index 1d5729e..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$PluginAccessors.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$VersionAccessors.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$VersionAccessors.class deleted file mode 100644 index 3ac9f93..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$VersionAccessors.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.class b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.class deleted file mode 100644 index 6051b7d..0000000 Binary files a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.class and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/metadata.bin b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/metadata.bin deleted file mode 100644 index 71fcfcb..0000000 --- a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/metadata.bin +++ /dev/null @@ -1 +0,0 @@ -tajbjehwvzefbn4rpr56ei3keyA'*mI:classes>#D18#asources.<ҰԟbQ0ڈ \ No newline at end of file diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/sources/org/gradle/accessors/dm/LibrariesForLibs.java b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/sources/org/gradle/accessors/dm/LibrariesForLibs.java deleted file mode 100644 index 8c97a4d..0000000 --- a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/sources/org/gradle/accessors/dm/LibrariesForLibs.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.gradle.accessors.dm; - -import org.gradle.api.NonNullApi; -import org.gradle.api.artifacts.MinimalExternalModuleDependency; -import org.gradle.plugin.use.PluginDependency; -import org.gradle.api.artifacts.ExternalModuleDependencyBundle; -import org.gradle.api.artifacts.MutableVersionConstraint; -import org.gradle.api.provider.Provider; -import org.gradle.api.model.ObjectFactory; -import org.gradle.api.provider.ProviderFactory; -import org.gradle.api.internal.catalog.AbstractExternalDependencyFactory; -import org.gradle.api.internal.catalog.DefaultVersionCatalog; -import java.util.Map; -import org.gradle.api.internal.attributes.ImmutableAttributesFactory; -import org.gradle.api.internal.artifacts.dsl.CapabilityNotationParser; -import javax.inject.Inject; - -/** - * A catalog of dependencies accessible via the {@code libs} extension. - */ -@NonNullApi -public class LibrariesForLibs extends AbstractExternalDependencyFactory { - - private final AbstractExternalDependencyFactory owner = this; - private final VersionAccessors vaccForVersionAccessors = new VersionAccessors(providers, config); - private final BundleAccessors baccForBundleAccessors = new BundleAccessors(objects, providers, config, attributesFactory, capabilityNotationParser); - private final PluginAccessors paccForPluginAccessors = new PluginAccessors(providers, config); - - @Inject - public LibrariesForLibs(DefaultVersionCatalog config, ProviderFactory providers, ObjectFactory objects, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { - super(config, providers, objects, attributesFactory, capabilityNotationParser); - } - - /** - * Group of versions at versions - */ - public VersionAccessors getVersions() { - return vaccForVersionAccessors; - } - - /** - * Group of bundles at bundles - */ - public BundleAccessors getBundles() { - return baccForBundleAccessors; - } - - /** - * Group of plugins at plugins - */ - public PluginAccessors getPlugins() { - return paccForPluginAccessors; - } - - public static class VersionAccessors extends VersionFactory { - - public VersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - } - - public static class BundleAccessors extends BundleFactory { - - public BundleAccessors(ObjectFactory objects, ProviderFactory providers, DefaultVersionCatalog config, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { super(objects, providers, config, attributesFactory, capabilityNotationParser); } - - } - - public static class PluginAccessors extends PluginFactory { - - public PluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - /** - * Plugin provider for algomate with plugin id org.tudalgo.algomate and - * with version 0.7.1 - *

- * This plugin was declared in catalog libs.versions.toml - */ - public Provider getAlgomate() { return createPlugin("algomate"); } - - /** - * Plugin provider for style with plugin id org.sourcegrade.style and - * with version 3.0.0 - *

- * This plugin was declared in catalog libs.versions.toml - */ - public Provider getStyle() { return createPlugin("style"); } - - } - -} diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java b/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java deleted file mode 100644 index 27443a0..0000000 --- a/solution/H07/.gradle/8.10.2/dependencies-accessors/700afc2217d5ebd6a4de719b82fc768475ac4788/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.gradle.accessors.dm; - -import org.gradle.api.NonNullApi; -import org.gradle.api.artifacts.MinimalExternalModuleDependency; -import org.gradle.plugin.use.PluginDependency; -import org.gradle.api.artifacts.ExternalModuleDependencyBundle; -import org.gradle.api.artifacts.MutableVersionConstraint; -import org.gradle.api.provider.Provider; -import org.gradle.api.model.ObjectFactory; -import org.gradle.api.provider.ProviderFactory; -import org.gradle.api.internal.catalog.AbstractExternalDependencyFactory; -import org.gradle.api.internal.catalog.DefaultVersionCatalog; -import java.util.Map; -import org.gradle.api.internal.attributes.ImmutableAttributesFactory; -import org.gradle.api.internal.artifacts.dsl.CapabilityNotationParser; -import javax.inject.Inject; - -/** - * A catalog of dependencies accessible via the {@code libs} extension. - */ -@NonNullApi -public class LibrariesForLibsInPluginsBlock extends AbstractExternalDependencyFactory { - - private final AbstractExternalDependencyFactory owner = this; - private final VersionAccessors vaccForVersionAccessors = new VersionAccessors(providers, config); - private final BundleAccessors baccForBundleAccessors = new BundleAccessors(objects, providers, config, attributesFactory, capabilityNotationParser); - private final PluginAccessors paccForPluginAccessors = new PluginAccessors(providers, config); - - @Inject - public LibrariesForLibsInPluginsBlock(DefaultVersionCatalog config, ProviderFactory providers, ObjectFactory objects, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { - super(config, providers, objects, attributesFactory, capabilityNotationParser); - } - - /** - * Group of versions at versions - */ - public VersionAccessors getVersions() { - return vaccForVersionAccessors; - } - - /** - * Group of bundles at bundles - * - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public BundleAccessors getBundles() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return baccForBundleAccessors; - } - - /** - * Group of plugins at plugins - */ - public PluginAccessors getPlugins() { - return paccForPluginAccessors; - } - - public static class VersionAccessors extends VersionFactory { - - public VersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class BundleAccessors extends BundleFactory { - - public BundleAccessors(ObjectFactory objects, ProviderFactory providers, DefaultVersionCatalog config, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { super(objects, providers, config, attributesFactory, capabilityNotationParser); } - - } - - public static class PluginAccessors extends PluginFactory { - - public PluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - /** - * Plugin provider for algomate with plugin id org.tudalgo.algomate and - * with version 0.7.1 - *

- * This plugin was declared in catalog libs.versions.toml - */ - public Provider getAlgomate() { return createPlugin("algomate"); } - - /** - * Plugin provider for style with plugin id org.sourcegrade.style and - * with version 3.0.0 - *

- * This plugin was declared in catalog libs.versions.toml - */ - public Provider getStyle() { return createPlugin("style"); } - - } - -} diff --git a/solution/H07/.gradle/8.10.2/dependencies-accessors/gc.properties b/solution/H07/.gradle/8.10.2/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/solution/H07/.gradle/8.10.2/executionHistory/executionHistory.bin b/solution/H07/.gradle/8.10.2/executionHistory/executionHistory.bin deleted file mode 100644 index 8bb310d..0000000 Binary files a/solution/H07/.gradle/8.10.2/executionHistory/executionHistory.bin and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/executionHistory/executionHistory.lock b/solution/H07/.gradle/8.10.2/executionHistory/executionHistory.lock deleted file mode 100644 index 84cd24f..0000000 Binary files a/solution/H07/.gradle/8.10.2/executionHistory/executionHistory.lock and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/fileChanges/last-build.bin b/solution/H07/.gradle/8.10.2/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/solution/H07/.gradle/8.10.2/fileChanges/last-build.bin and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/fileHashes/fileHashes.bin b/solution/H07/.gradle/8.10.2/fileHashes/fileHashes.bin deleted file mode 100644 index a64a10f..0000000 Binary files a/solution/H07/.gradle/8.10.2/fileHashes/fileHashes.bin and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/fileHashes/fileHashes.lock b/solution/H07/.gradle/8.10.2/fileHashes/fileHashes.lock deleted file mode 100644 index b563849..0000000 Binary files a/solution/H07/.gradle/8.10.2/fileHashes/fileHashes.lock and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/solution/H07/.gradle/8.10.2/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 6cd958e..0000000 Binary files a/solution/H07/.gradle/8.10.2/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/solution/H07/.gradle/8.10.2/gc.properties b/solution/H07/.gradle/8.10.2/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/solution/H07/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/solution/H07/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index a010a4a..0000000 Binary files a/solution/H07/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/solution/H07/.gradle/buildOutputCleanup/cache.properties b/solution/H07/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 3167fe9..0000000 --- a/solution/H07/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sun Mar 16 16:24:15 CET 2025 -gradle.version=8.10.2 diff --git a/solution/H07/.gradle/buildOutputCleanup/outputFiles.bin b/solution/H07/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index a52a676..0000000 Binary files a/solution/H07/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/solution/H07/.gradle/vcs-1/gc.properties b/solution/H07/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/solution/H07/.idea/.gitignore b/solution/H07/.idea/.gitignore deleted file mode 100644 index b58b603..0000000 --- a/solution/H07/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/solution/H07/.idea/.name b/solution/H07/.idea/.name deleted file mode 100644 index f4667c4..0000000 --- a/solution/H07/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -H07-Root \ No newline at end of file diff --git a/solution/H07/.idea/codeStyles/Project.xml b/solution/H07/.idea/codeStyles/Project.xml deleted file mode 100644 index 919ce1f..0000000 --- a/solution/H07/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/solution/H07/.idea/codeStyles/codeStyleConfig.xml b/solution/H07/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/solution/H07/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/solution/H07/.idea/compiler.xml b/solution/H07/.idea/compiler.xml deleted file mode 100644 index b86273d..0000000 --- a/solution/H07/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/solution/H07/.idea/gradle.xml b/solution/H07/.idea/gradle.xml deleted file mode 100644 index ce1c62c..0000000 --- a/solution/H07/.idea/gradle.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/solution/H07/.idea/misc.xml b/solution/H07/.idea/misc.xml deleted file mode 100644 index 7c47dd4..0000000 --- a/solution/H07/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/solution/H07/.idea/sbt.xml b/solution/H07/.idea/sbt.xml deleted file mode 100644 index 2616292..0000000 --- a/solution/H07/.idea/sbt.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/solution/H07/.idea/vcs.xml b/solution/H07/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/solution/H07/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/solution/H07/build/classes/java/graderPrivate/h07/ArithmeticExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/ArithmeticExpressionTest.class deleted file mode 100644 index c969027..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/ArithmeticExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/ClassReference.class b/solution/H07/build/classes/java/graderPrivate/h07/ClassReference.class deleted file mode 100644 index 88db4a6..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/ClassReference.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/ConvertNumberToPeanoExpressionImplTest.class b/solution/H07/build/classes/java/graderPrivate/h07/ConvertNumberToPeanoExpressionImplTest.class deleted file mode 100644 index 608da6d..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/ConvertNumberToPeanoExpressionImplTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/ConvertNumberToPeanoExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/ConvertNumberToPeanoExpressionTest.class deleted file mode 100644 index c89acfe..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/ConvertNumberToPeanoExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/ConvertPeanoToNumberExpressionImplTest.class b/solution/H07/build/classes/java/graderPrivate/h07/ConvertPeanoToNumberExpressionImplTest.class deleted file mode 100644 index 42c644b..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/ConvertPeanoToNumberExpressionImplTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/ConvertPeanoToNumberExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/ConvertPeanoToNumberExpressionTest.class deleted file mode 100644 index 6212fb3..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/ConvertPeanoToNumberExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/H07Test$1.class b/solution/H07/build/classes/java/graderPrivate/h07/H07Test$1.class deleted file mode 100644 index 76b642f..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/H07Test$1.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/H07Test.class b/solution/H07/build/classes/java/graderPrivate/h07/H07Test.class deleted file mode 100644 index e9c8131..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/H07Test.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/H07_RubricProvider.class b/solution/H07/build/classes/java/graderPrivate/h07/H07_RubricProvider.class deleted file mode 100644 index 0446fcd..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/H07_RubricProvider.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/MethodReference.class b/solution/H07/build/classes/java/graderPrivate/h07/MethodReference.class deleted file mode 100644 index 2c05b6b..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/MethodReference.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/NumberConverter.class b/solution/H07/build/classes/java/graderPrivate/h07/NumberConverter.class deleted file mode 100644 index 2053819..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/NumberConverter.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/NumberExpressionFactoryTest.class b/solution/H07/build/classes/java/graderPrivate/h07/NumberExpressionFactoryTest.class deleted file mode 100644 index e8c3f6e..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/NumberExpressionFactoryTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/NumberExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/NumberExpressionTest.class deleted file mode 100644 index 4d3996b..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/NumberExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/PeanoAddExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/PeanoAddExpressionTest.class deleted file mode 100644 index c166738..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/PeanoAddExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/PeanoArithmeticExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/PeanoArithmeticExpressionTest.class deleted file mode 100644 index 985bfd9..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/PeanoArithmeticExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/PeanoMultiplyExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/PeanoMultiplyExpressionTest.class deleted file mode 100644 index cb89bdc..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/PeanoMultiplyExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/PeanoNumberExpressionFactoryTest.class b/solution/H07/build/classes/java/graderPrivate/h07/PeanoNumberExpressionFactoryTest.class deleted file mode 100644 index 42ff255..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/PeanoNumberExpressionFactoryTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/PeanoNumberExpressionTest.class b/solution/H07/build/classes/java/graderPrivate/h07/PeanoNumberExpressionTest.class deleted file mode 100644 index b619d42..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/PeanoNumberExpressionTest.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/Tests$1$1.class b/solution/H07/build/classes/java/graderPrivate/h07/Tests$1$1.class deleted file mode 100644 index 70e3f5e..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/Tests$1$1.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/Tests$1.class b/solution/H07/build/classes/java/graderPrivate/h07/Tests$1.class deleted file mode 100644 index 329655a..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/Tests$1.class and /dev/null differ diff --git a/solution/H07/build/classes/java/graderPrivate/h07/Tests.class b/solution/H07/build/classes/java/graderPrivate/h07/Tests.class deleted file mode 100644 index 0d80651..0000000 Binary files a/solution/H07/build/classes/java/graderPrivate/h07/Tests.class and /dev/null differ diff --git a/solution/H07/build/classes/java/main/h07/Main.class b/solution/H07/build/classes/java/main/h07/Main.class deleted file mode 100644 index 3628d1c..0000000 Binary files a/solution/H07/build/classes/java/main/h07/Main.class and /dev/null differ diff --git a/solution/H07/build/classes/java/main/h07/NumberExpressionFactory.class b/solution/H07/build/classes/java/main/h07/NumberExpressionFactory.class deleted file mode 100644 index 010685c..0000000 Binary files a/solution/H07/build/classes/java/main/h07/NumberExpressionFactory.class and /dev/null differ diff --git a/solution/H07/build/classes/java/main/h07/peano/NaturalNumber.class b/solution/H07/build/classes/java/main/h07/peano/NaturalNumber.class deleted file mode 100644 index 0b93486..0000000 Binary files a/solution/H07/build/classes/java/main/h07/peano/NaturalNumber.class and /dev/null differ diff --git a/solution/H07/build/classes/java/main/h07/peano/PeanoNumberExpressionFactory.class b/solution/H07/build/classes/java/main/h07/peano/PeanoNumberExpressionFactory.class deleted file mode 100644 index 635524c..0000000 Binary files a/solution/H07/build/classes/java/main/h07/peano/PeanoNumberExpressionFactory.class and /dev/null differ diff --git a/solution/H07/build/classes/java/main/h07/peano/Successor.class b/solution/H07/build/classes/java/main/h07/peano/Successor.class deleted file mode 100644 index e21add3..0000000 Binary files a/solution/H07/build/classes/java/main/h07/peano/Successor.class and /dev/null differ diff --git a/solution/H07/build/classes/java/main/h07/peano/Zero.class b/solution/H07/build/classes/java/main/h07/peano/Zero.class deleted file mode 100644 index dc03200..0000000 Binary files a/solution/H07/build/classes/java/main/h07/peano/Zero.class and /dev/null differ diff --git a/solution/H07/build/classes/java/test/h07/ExampleJUnitTest.class b/solution/H07/build/classes/java/test/h07/ExampleJUnitTest.class deleted file mode 100644 index 774183b..0000000 Binary files a/solution/H07/build/classes/java/test/h07/ExampleJUnitTest.class and /dev/null differ diff --git a/solution/H07/build/resources/jagr/graderPrivate/grader-info.json b/solution/H07/build/resources/jagr/graderPrivate/grader-info.json deleted file mode 100644 index c142ecb..0000000 --- a/solution/H07/build/resources/jagr/graderPrivate/grader-info.json +++ /dev/null @@ -1 +0,0 @@ -{"assignmentId":"h07","jagrVersion":"0.10.3","sourceSets":[{"name":"grader","files":{"resources":["h07/NumberExpressionFactory_filter_true.json","h07/ConvertNumberToPeanoExpressionImpl_0.json","h07/PeanoMultiplyExpression_X0.json","h07/PeanoNumberExpressionFactory_filled.json","h07/NumberExpressionFactory_filter_false.json","h07/ConvertNumberToPeanoExpressionImpl_X.json","h07/NumberExpressionFactory_filter_complex.json","h07/NumberExpressionFactory_multiply_Complex.json","h07/PeanoAddExpression_0X.json","h07/PeanoMultiplyExpression_XY.json","h07/NumberExpressionFactory_multiply_Simple.json","h07/PeanoNumberExpressionFactory_fromNumber.json","h07/PeanoMultiplyExpression_0X.json","h07/PeanoAddExpression_X0.json","h07/PeanoNumberExpressionFactory_empty.json","h07/NumberExpressionFactory_filter_empty.json","h07/ConvertPeanoToNumberExpressionImpl_0.json","h07/ConvertPeanoToNumberExpressionImpl_X.json","h07/PeanoAddExpression_XY.json"],"java":["h07/ConvertPeanoToNumberExpressionTest.java","h07/ArithmeticExpressionTest.java","h07/ConvertNumberToPeanoExpressionTest.java","h07/PeanoMultiplyExpressionTest.java","h07/MethodReference.java","h07/ClassReference.java","h07/PeanoNumberExpressionFactoryTest.java","h07/PeanoNumberExpressionTest.java","h07/PeanoArithmeticExpressionTest.java","h07/H07Test.java","h07/Tests.java","h07/PeanoAddExpressionTest.java","h07/NumberExpressionFactoryTest.java","h07/ConvertNumberToPeanoExpressionImplTest.java","h07/NumberExpressionTest.java","h07/NumberConverter.java","h07/H07_RubricProvider.java","h07/ConvertPeanoToNumberExpressionImplTest.java"]}},{"name":"main","files":{"java":["h07/NumberExpressionFactory.java","h07/peano/Successor.java","h07/peano/Zero.java","h07/peano/NaturalNumber.java","h07/peano/PeanoNumberExpressionFactory.java","h07/Main.java"]}},{"name":"test","files":{"java":["h07/ExampleJUnitTest.java"]}}],"dependencyConfigurations":{"graderImplementation":["org.tudalgo:algoutils-tutor:0.7.2","org.junit-pioneer:junit-pioneer:2.3.0","org.sourcegrade:jagr-launcher:0.10.3"],"implementation":["org.tudalgo:algoutils-student:0.7.2","org.jetbrains:annotations:26.0.0"],"testImplementation":["org.junit.jupiter:junit-jupiter:5.11.2"]},"repositoryConfigurations":[{"name":"maven","url":"https://s01.oss.sonatype.org/content/repositories/snapshots"},{"name":"maven2","url":"https://jitpack.io"},{"name":"MavenRepo","url":"https://repo.maven.apache.org/maven2/"}],"name":"FOP-2425-H07-Private","rubricProviderName":"h07.H07_RubricProvider"} \ No newline at end of file diff --git a/solution/H07/build/resources/jagr/graderPrivate/rubric/h07_ab12cdef_sol_last_sol_first.html b/solution/H07/build/resources/jagr/graderPrivate/rubric/h07_ab12cdef_sol_last_sol_first.html deleted file mode 100644 index ff0de73..0000000 --- a/solution/H07/build/resources/jagr/graderPrivate/rubric/h07_ab12cdef_sol_last_sol_first.html +++ /dev/null @@ -1 +0,0 @@ -

H07 | Peano Arithmetik
KriteriumMöglichErzieltKommentar
H7.1 | Interfaces definieren[0, 4]0
H7.1.1 | NumberExpression[0, 2]0
1 Das Interface NumberExpression wurde korrekt erstellt.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
2 Das Interface PeanoNumberExpression wurde korrekt erstellt.[0, 1]0Kind does not match expected kind. {
expected package = h07.peano,
expected kind = INTERFACE,
expected name = PeanoNumberExpression,
expected modifier = ,
package = h07.peano,
kind = CLASS,
name = PeanoNumberExpressionFactory
}
expected <INTERFACE>
actual <CLASS>
H7.1.2 | ArithmeticExpression[0, 2]0
3 Das Interface ArithmeticExpression wurde korrekt erstellt.[0, 1]0Could not find Type ArithmeticExpression. Type is not defined or could not be found.
expected <true>
actual <false>
4 Das Interface PeanoArithmeticExpression wurde korrekt erstellt.[0, 1]0Could not find Type PeanoArithmeticExpression. Type is not defined or could not be found.
expected <true>
actual <false>
5 Alle Klassen und Methoden wurden korrekt benannt.[-1, 0]-1NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.NumberExpressionTest.testNaming(NumberExpressionTest.java:18)
6 Alle Klassen wurden im korrekten package definiert.[-1, 0]-1Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
H7.2 | Multiplikationstabelle[0, 3]0
H7.2.1 | Multiplikationstabelle[0, 3]0
7 Für ArithmeticExpression wurden nur Lambda-Ausdrücke in Standardform und für NumberExpression nur Lambda-Ausdrücke in Kurzform verwendet.[0, 1]0NoSuchElementException: No value present @ java.base/java.util.Optional.get(Optional.java:143)
8 Die Multiplikationstabelle gibt für lowerBound = upperBound die korrekten Werte aus.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 4 more failing tests
9 Die Multiplikationstabelle gibt für komplexere lowerBound und upperBound Werte die korrekten Werte aus.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 5 more failing tests
H7.3 | Peano Arithmetik[0, 10]0
H7.3.1 | PeanoAddExpression[0, 5]0
10 Die Klasse PeanoAddExpression wurde korrekt erstellt.[0, 1]0Could not find Type PeanoAddExpression. Type is not defined or could not be found.
expected <true>
actual <false>
11 Die Methode evaluate gibt für X + 0 das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
12 Die Methode evaluate gibt für 0 + X das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
13 Die Methode evaluate gibt für X + Y das korrekte Ergebnis zurück.[0, 2]0Could not initialize class h07.MethodReference

there are 7 more failing tests
14 Verbindliche Anforderung nicht erfüllt[-2, 0]-2NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.PeanoAddExpressionTest.testEvaluateRequirements(PeanoAddExpressionTest.java:87)
H7.3.2 | PeanoMultiplyExpression[0, 5]0
15 Die Klasse PeanoMultiplyExpression wurde korrekt erstellt.[0, 1]0Could not find Type PeanoMultiplyExpression. Type is not defined or could not be found.
expected <true>
actual <false>
16 Die Methode evaluate gibt für X * 0 das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
17 Die Methode evaluate gibt für 0 * X das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
18 Die Methode evaluate gibt für X * Y das korrekte Ergebnis zurück.[0, 2]0Could not initialize class h07.MethodReference

there are 7 more failing tests
19 Verbindliche Anforderung nicht erfüllt[-2, 0]-2NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.PeanoMultiplyExpressionTest.testEvaluateRequirements(PeanoMultiplyExpressionTest.java:87)
20 Alle Klassen und Methoden wurden korrekt benannt.[-1, 0]0
21 Alle Klassen wurden im korrekten package definiert.[-1, 0]-1Could not find Type PeanoAddExpression. Type is not defined or could not be found.
expected <true>
actual <false>
H7.4 | Funktionen höherer Ordnung[0, 15]0
H7.4.1 | Interfaces für Map erstellen[0, 2]0
22 Das Interface ConvertNumberToPeanoExpression wurde korrekt erstellt.[0, 1]0Could not find Type ConvertNumberToPeanoExpression. Type is not defined or could not be found.
expected <true>
actual <false>
23 Das Interface ConvertPeanoToNumberExpression wurde korrekt erstellt.[0, 1]0Could not find Type ConvertPeanoToNumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
H7.4.2 | Conversions Implementieren[0, 7]0
24 Die Klasse ConvertNumberToPeanoExpressionImpl wurde korrekt erstellt.[0, 1]0Could not find Type ConvertNumberToPeanoExpressionImpl. Type is not defined or could not be found.
expected <true>
actual <false>
25 Die Methode convert von ConvertNumberToPeanoExpressionImpl gibt für 0 das korrekte Ergebnis zurück.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
26 Die Methode convert von ConvertNumberToPeanoExpressionImpl gibt für X das korrekte Ergebnis zurück.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 7 more failing tests
27 Die Klasse ConvertPeanoToNumberExpressionImpl wurde korrekt erstellt.[0, 1]0Could not find Type ConvertPeanoToNumberExpressionImpl. Type is not defined or could not be found.
expected <true>
actual <false>
28 Die Methode convert von ConvertPeanoToNumberExpressionImpl gibt für 0 das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference
29 Die Methode convert von ConvertPeanoToNumberExpressionImpl gibt für X das korrekte Ergebnis zurück.[0, 2]0Could not initialize class h07.MethodReference

there are 7 more failing tests
H7.4.3 | Von Zahlen zu Peano-Zahlen[0, 1]0
30 Die Methode fromNumberExpressions in PeanoNumberExpressionFactory wandelt einen Array von NumberExpressions korrekt um.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 4 more failing tests
H7.4.4 | Filter[0, 3]0
31 Filter gibt für ein leeres Array ein leeres Array zurück.[0, 1]0Could not find method NumberExpressionFactory.filter()
32 Filter gibt für ein Predicate, das immer true ist, das gesamte Array zurück und für ein Predicate, das immer false ist, ein leeres Array.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 3 more failing tests
33 Filter gibt für ein Predicate, welches nur durch vier teilbare Zahlen akzeptiert, nur die durch drei teilbaren Zahlen zurück.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 6 more failing tests
H7.4.5 | Fold[0, 2]0
34 Fold gibt für ein leeres Array das Initial zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 2 more failing tests
35 Fold gibt für ein Array mit mehreren Elementen das korrekte Ergebnis zurück.[0, 1]0java.lang.NoClassDefFoundError: Could not initialize class h07.MethodReference

there are 3 more failing tests
36 Alle Klassen und Methoden wurden korrekt benannt.[-1, 0]-1NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.ConvertNumberToPeanoExpressionTest.testNaming(ConvertNumberToPeanoExpressionTest.java:18)
37 Alle Klassen wurden im korrekten package definiert.[-1, 0]-1Could not find Type ConvertNumberToPeanoExpression. Type is not defined or could not be found.
expected <true>
actual <false>
Gesamt[0, 32]0
\ No newline at end of file diff --git a/solution/H07/build/resources/jagr/graderPrivate/rubric/h07_ab12cdef_sol_last_sol_first.json b/solution/H07/build/resources/jagr/graderPrivate/rubric/h07_ab12cdef_sol_last_sol_first.json deleted file mode 100644 index a8ef3a2..0000000 --- a/solution/H07/build/resources/jagr/graderPrivate/rubric/h07_ab12cdef_sol_last_sol_first.json +++ /dev/null @@ -1 +0,0 @@ -{"submissionInfo":{"assignmentId":"h07","jagrVersion":"0.10.3","sourceSets":[{"name":"main","files":{"java":["h07/NumberExpressionFactory.java","h07/peano/Successor.java","h07/peano/Zero.java","h07/peano/NaturalNumber.java","h07/peano/PeanoNumberExpressionFactory.java","h07/Main.java"]}},{"name":"test","files":{"java":["h07/ExampleJUnitTest.java"]}}],"dependencyConfigurations":{"implementation":["org.tudalgo:algoutils-student:0.7.2","org.jetbrains:annotations:26.0.0"],"testImplementation":["org.junit.jupiter:junit-jupiter:5.11.2"]},"repositoryConfigurations":[{"name":"maven","url":"https://s01.oss.sonatype.org/content/repositories/snapshots"},{"name":"maven2","url":"https://jitpack.io"},{"name":"MavenRepo","url":"https://repo.maven.apache.org/maven2/"}],"studentId":"ab12cdef","firstName":"sol_first","lastName":"sol_last"},"totalPoints":0,"feedbackComment":"
H07 | Peano Arithmetik
KriteriumMöglichErzieltKommentar
H7.1 | Interfaces definieren[0, 4]0
H7.1.1 | NumberExpression[0, 2]0
1 Das Interface NumberExpression wurde korrekt erstellt.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
2 Das Interface PeanoNumberExpression wurde korrekt erstellt.[0, 1]0Kind does not match expected kind. {
expected package = h07.peano,
expected kind = INTERFACE,
expected name = PeanoNumberExpression,
expected modifier = ,
package = h07.peano,
kind = CLASS,
name = PeanoNumberExpressionFactory
}
expected <INTERFACE>
actual <CLASS>
H7.1.2 | ArithmeticExpression[0, 2]0
3 Das Interface ArithmeticExpression wurde korrekt erstellt.[0, 1]0Could not find Type ArithmeticExpression. Type is not defined or could not be found.
expected <true>
actual <false>
4 Das Interface PeanoArithmeticExpression wurde korrekt erstellt.[0, 1]0Could not find Type PeanoArithmeticExpression. Type is not defined or could not be found.
expected <true>
actual <false>
5 Alle Klassen und Methoden wurden korrekt benannt.[-1, 0]-1NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.NumberExpressionTest.testNaming(NumberExpressionTest.java:18)
6 Alle Klassen wurden im korrekten package definiert.[-1, 0]-1Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
H7.2 | Multiplikationstabelle[0, 3]0
H7.2.1 | Multiplikationstabelle[0, 3]0
7 Für ArithmeticExpression wurden nur Lambda-Ausdrücke in Standardform und für NumberExpression nur Lambda-Ausdrücke in Kurzform verwendet.[0, 1]0NoSuchElementException: No value present @ java.base/java.util.Optional.get(Optional.java:143)
8 Die Multiplikationstabelle gibt für lowerBound = upperBound die korrekten Werte aus.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 4 more failing tests
9 Die Multiplikationstabelle gibt für komplexere lowerBound und upperBound Werte die korrekten Werte aus.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 5 more failing tests
H7.3 | Peano Arithmetik[0, 10]0
H7.3.1 | PeanoAddExpression[0, 5]0
10 Die Klasse PeanoAddExpression wurde korrekt erstellt.[0, 1]0Could not find Type PeanoAddExpression. Type is not defined or could not be found.
expected <true>
actual <false>
11 Die Methode evaluate gibt für X + 0 das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
12 Die Methode evaluate gibt für 0 + X das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
13 Die Methode evaluate gibt für X + Y das korrekte Ergebnis zurück.[0, 2]0Could not initialize class h07.MethodReference

there are 7 more failing tests
14 Verbindliche Anforderung nicht erfüllt[-2, 0]-2NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.PeanoAddExpressionTest.testEvaluateRequirements(PeanoAddExpressionTest.java:87)
H7.3.2 | PeanoMultiplyExpression[0, 5]0
15 Die Klasse PeanoMultiplyExpression wurde korrekt erstellt.[0, 1]0Could not find Type PeanoMultiplyExpression. Type is not defined or could not be found.
expected <true>
actual <false>
16 Die Methode evaluate gibt für X * 0 das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
17 Die Methode evaluate gibt für 0 * X das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 4 more failing tests
18 Die Methode evaluate gibt für X * Y das korrekte Ergebnis zurück.[0, 2]0Could not initialize class h07.MethodReference

there are 7 more failing tests
19 Verbindliche Anforderung nicht erfüllt[-2, 0]-2NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.PeanoMultiplyExpressionTest.testEvaluateRequirements(PeanoMultiplyExpressionTest.java:87)
20 Alle Klassen und Methoden wurden korrekt benannt.[-1, 0]0
21 Alle Klassen wurden im korrekten package definiert.[-1, 0]-1Could not find Type PeanoAddExpression. Type is not defined or could not be found.
expected <true>
actual <false>
H7.4 | Funktionen höherer Ordnung[0, 15]0
H7.4.1 | Interfaces für Map erstellen[0, 2]0
22 Das Interface ConvertNumberToPeanoExpression wurde korrekt erstellt.[0, 1]0Could not find Type ConvertNumberToPeanoExpression. Type is not defined or could not be found.
expected <true>
actual <false>
23 Das Interface ConvertPeanoToNumberExpression wurde korrekt erstellt.[0, 1]0Could not find Type ConvertPeanoToNumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
H7.4.2 | Conversions Implementieren[0, 7]0
24 Die Klasse ConvertNumberToPeanoExpressionImpl wurde korrekt erstellt.[0, 1]0Could not find Type ConvertNumberToPeanoExpressionImpl. Type is not defined or could not be found.
expected <true>
actual <false>
25 Die Methode convert von ConvertNumberToPeanoExpressionImpl gibt für 0 das korrekte Ergebnis zurück.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>
26 Die Methode convert von ConvertNumberToPeanoExpressionImpl gibt für X das korrekte Ergebnis zurück.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 7 more failing tests
27 Die Klasse ConvertPeanoToNumberExpressionImpl wurde korrekt erstellt.[0, 1]0Could not find Type ConvertPeanoToNumberExpressionImpl. Type is not defined or could not be found.
expected <true>
actual <false>
28 Die Methode convert von ConvertPeanoToNumberExpressionImpl gibt für 0 das korrekte Ergebnis zurück.[0, 1]0Could not initialize class h07.MethodReference
29 Die Methode convert von ConvertPeanoToNumberExpressionImpl gibt für X das korrekte Ergebnis zurück.[0, 2]0Could not initialize class h07.MethodReference

there are 7 more failing tests
H7.4.3 | Von Zahlen zu Peano-Zahlen[0, 1]0
30 Die Methode fromNumberExpressions in PeanoNumberExpressionFactory wandelt einen Array von NumberExpressions korrekt um.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 4 more failing tests
H7.4.4 | Filter[0, 3]0
31 Filter gibt für ein leeres Array ein leeres Array zurück.[0, 1]0Could not find method NumberExpressionFactory.filter()
32 Filter gibt für ein Predicate, das immer true ist, das gesamte Array zurück und für ein Predicate, das immer false ist, ein leeres Array.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 3 more failing tests
33 Filter gibt für ein Predicate, welches nur durch vier teilbare Zahlen akzeptiert, nur die durch drei teilbaren Zahlen zurück.[0, 1]0Could not find Type NumberExpression. Type is not defined or could not be found.
expected <true>
actual <false>


there are 6 more failing tests
H7.4.5 | Fold[0, 2]0
34 Fold gibt für ein leeres Array das Initial zurück.[0, 1]0Could not initialize class h07.MethodReference

there are 2 more failing tests
35 Fold gibt für ein Array mit mehreren Elementen das korrekte Ergebnis zurück.[0, 1]0java.lang.NoClassDefFoundError: Could not initialize class h07.MethodReference

there are 3 more failing tests
36 Alle Klassen und Methoden wurden korrekt benannt.[-1, 0]-1NoClassDefFoundError: Could not initialize class h07.MethodReference @ h07.ConvertNumberToPeanoExpressionTest.testNaming(ConvertNumberToPeanoExpressionTest.java:18)
37 Alle Klassen wurden im korrekten package definiert.[-1, 0]-1Could not find Type ConvertNumberToPeanoExpression. Type is not defined or could not be found.
expected <true>
actual <false>
Gesamt[0, 32]0
"} \ No newline at end of file diff --git a/solution/H07/build/resources/jagr/main/submission-info.json b/solution/H07/build/resources/jagr/main/submission-info.json deleted file mode 100644 index 0152b79..0000000 --- a/solution/H07/build/resources/jagr/main/submission-info.json +++ /dev/null @@ -1 +0,0 @@ -{"assignmentId":"h07","jagrVersion":"0.10.3","sourceSets":[{"name":"main","files":{"java":["h07/NumberExpressionFactory.java","h07/peano/Successor.java","h07/peano/Zero.java","h07/peano/NaturalNumber.java","h07/peano/PeanoNumberExpressionFactory.java","h07/Main.java"]}},{"name":"test","files":{"java":["h07/ExampleJUnitTest.java"]}}],"dependencyConfigurations":{"implementation":["org.tudalgo:algoutils-student:0.7.2","org.jetbrains:annotations:26.0.0"],"testImplementation":["org.junit.jupiter:junit-jupiter:5.11.2"]},"repositoryConfigurations":[{"name":"maven","url":"https://s01.oss.sonatype.org/content/repositories/snapshots"},{"name":"maven2","url":"https://jitpack.io"},{"name":"MavenRepo","url":"https://repo.maven.apache.org/maven2/"}],"studentId":"ab12cdef","firstName":"sol_first","lastName":"sol_last"} \ No newline at end of file diff --git a/solution/H07/build/tmp/compileGraderPrivateJava/previous-compilation-data.bin b/solution/H07/build/tmp/compileGraderPrivateJava/previous-compilation-data.bin deleted file mode 100644 index 3a5102f..0000000 Binary files a/solution/H07/build/tmp/compileGraderPrivateJava/previous-compilation-data.bin and /dev/null differ diff --git a/solution/H07/build/tmp/compileJava/previous-compilation-data.bin b/solution/H07/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index 5b567e2..0000000 Binary files a/solution/H07/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ diff --git a/solution/H07/build/tmp/compileTestJava/previous-compilation-data.bin b/solution/H07/build/tmp/compileTestJava/previous-compilation-data.bin deleted file mode 100644 index 1051ea7..0000000 Binary files a/solution/H07/build/tmp/compileTestJava/previous-compilation-data.bin and /dev/null differ diff --git a/solution/H07/jagr.conf b/solution/H07/jagr.conf deleted file mode 100644 index dbd1da5..0000000 --- a/solution/H07/jagr.conf +++ /dev/null @@ -1,70 +0,0 @@ -# The locations of the following directories may be configured here -dir { - # Grader jar ingest directory - graders=graders - # Runtime dependencies for submissions - libs=libs - # Rubrics export directory - rubrics=rubrics - # Submissions ingest directory - submissions=submissions - # Submission export directory - submissions-export=submissions-export -} -executor { - # - # The maximum amount of concurrency to use for grading. - # For a given concurrency n, Jagr will ensure that a maximum of n threads or processes are used concurrently that actively run - # submission code. - concurrency=4 - # - # The JVM arguments to use for grading. These arguments are passed to the JVM that runs the grading code. - # This only applies to the "process" mode, as the "thread" and "single" modes do not spawn a new JVM. - # - jvm-args=[] - # - # The executor mode to use. The following options are available: - # - "single" :: - # Runs every TestCycle consecutively in the main thread. This mode does not create any extra processes or threads for grading. - # - # - "thread" :: - # Creates a separate thread for every TestCycle. This mode greatly speeds up the grading process, especially with a large - # amount of submissions. The overhead of creating, managing and synchronizing threads is minimal compared to the performance - # benefits. However, this mode has the danger of creating "unkillable" threads (e.g. from certain kinds of infinite loops) - # which dramatically slow down the grading process through resource starvation of the host machine. - # - # The maximum number of concurrent threads used for grading is defined by the option "concurrency". - # - # - "process" :: - # Creates a separate process for every TestCycle. This mode has the most overhead, but is also the most defensive against - # "badly behaving" code. A certain amount of sandboxing can be achieved in this mode, which is not possible in the other modes - # such as "thread" or "single". - # - # The maximum number of concurrent child process used for grading is defined by the option "concurrency". - mode=process - # - # The grading thread's maximum permitted elapsed userTime in milliseconds since the last timeout before an - # AssertionFailedError is thrown. If a thread's userTime satisfies - # (userTime - lastTimeout) > individualTimeout, - # the current userTime is stored for comparison later, and an AssertionFailedError is thrown to be caught by JUnit. - timeout-individual=10000 - # - # The grading thread's maximum permitted elapsed userTime in milliseconds (from thread start) before an - # AssertionFailedError is thrown. If a thread's userTime satisfies - # ((userTime - lastTimeout) > individualTimeout) && (userTime > totalTimeout), - # an AssertionFailedError is thrown to be caught by JUnit. Note that lastTimeout is not reset in this case, and all further - # invocations of checkTimeout() will result in an AssertionFailedError - timeout-total=150000 -} -extras { - moodle-unpack { - assignment-id-regex=".*Abgabe[^0-9]*(?[0-9]{1,2}).*[.]zip" - enabled=true - student-regex=".* - (?([a-z]{2}[0-9]{2}[a-z]{4})|([a-z]+_[a-z]+))/submissions/.*[.]jar" - } -} -transformers { - timeout { - enabled=true - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/ArithmeticExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/ArithmeticExpressionTest.java deleted file mode 100644 index a3b1d03..0000000 --- a/solution/H07/src/graderPrivate/java/h07/ArithmeticExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; - -@TestForSubmission -public class ArithmeticExpressionTest { - - @Test - public void testDefinition() { - ClassReference.ARITHMETIC_EXPRESSION.assertCorrectlyDefined(); - MethodReference.ARITHMETIC_EXPRESSION_EVALUATE.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.ARITHMETIC_EXPRESSION.assertNamedCorrectly(); - MethodReference.ARITHMETIC_EXPRESSION_EVALUATE.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.ARITHMETIC_EXPRESSION.assertDefinedInCorrectPackage(); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/ClassReference.java b/solution/H07/src/graderPrivate/java/h07/ClassReference.java deleted file mode 100644 index 0494ced..0000000 --- a/solution/H07/src/graderPrivate/java/h07/ClassReference.java +++ /dev/null @@ -1,187 +0,0 @@ -package h07; - -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.reflections.BasicPackageLink; -import org.tudalgo.algoutils.tutor.general.reflections.BasicTypeLink; -import org.tudalgo.algoutils.tutor.general.reflections.Link; -import org.tudalgo.algoutils.tutor.general.reflections.Modifier; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.*; - - -public class ClassReference { - - public static final List PREDEFINED_PACKAGES = List.of("h07", "h07.Peano", "h07.peano"); - - public static final ClassReference NUMBER_EXPRESSION = new ClassReference("h07", "NumberExpression", Link.Kind.INTERFACE); - public static final ClassReference PEANO_NUMBER_EXPRESSION = - new ClassReference("h07.peano", "PeanoNumberExpression", Link.Kind.INTERFACE); - public static final ClassReference ARITHMETIC_EXPRESSION = - new ClassReference("h07", "ArithmeticExpression", Link.Kind.INTERFACE); - public static final ClassReference PEANO_ARITHMETIC_EXPRESSION = - new ClassReference("h07.peano", "PeanoArithmeticExpression", Link.Kind.INTERFACE); - public static final ClassReference PEANO_ADD_EXPRESSION = new ClassReference("h07.peano", - "PeanoAddExpression", - Link.Kind.CLASS, - new BasicTypeLink[] {PEANO_ARITHMETIC_EXPRESSION.link}, - Modifier.PUBLIC, - Modifier.NON_FINAL - ); - public static final ClassReference PEANO_MULTIPLY_EXPRESSION = new ClassReference("h07.peano", - "PeanoMultiplyExpression", - Link.Kind.CLASS, - new BasicTypeLink[] {PEANO_ARITHMETIC_EXPRESSION.link}, - Modifier.PUBLIC, - Modifier.NON_FINAL - ); - public static final ClassReference CONVERT_NUMBER_TO_PEANO_EXPRESSION = - new ClassReference("h07", "ConvertNumberToPeanoExpression", Link.Kind.INTERFACE); - public static final ClassReference CONVERT_PEANO_TO_NUMBER_EXPRESSION = - new ClassReference("h07", "ConvertPeanoToNumberExpression", Link.Kind.INTERFACE); - public static final ClassReference CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL = new ClassReference("h07", - "ConvertNumberToPeanoExpressionImpl", - Link.Kind.CLASS, - new BasicTypeLink[] {CONVERT_NUMBER_TO_PEANO_EXPRESSION.link}, - Modifier.PUBLIC, - Modifier.NON_FINAL - ); - public static final ClassReference CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL = new ClassReference("h07", - "ConvertPeanoToNumberExpressionImpl", - Link.Kind.CLASS, - new BasicTypeLink[] {CONVERT_PEANO_TO_NUMBER_EXPRESSION.link}, - Modifier.PUBLIC, - Modifier.NON_FINAL - ); - - public static final ClassReference ZERO = new ClassReference("h07.peano", - "Zero", - Link.Kind.CLASS - ); - - public static final ClassReference SUCCESSOR = new ClassReference("h07.peano", - "Successor", - Link.Kind.CLASS - ); - - public static final ClassReference NATURAL_NUMBER = new ClassReference("h07.peano", - "NaturalNumber", - Link.Kind.CLASS - ); - - public static final ClassReference PEANO_NUMBER_EXPRESSION_FACTORY = new ClassReference("h07.peano", - "PeanoNumberExpressionFactory", - Link.Kind.CLASS - ); - - private final String pack; - private final String name; - private final Link.Kind kind; - private final BasicTypeLink[] superClasses; - private final Modifier[] modifiers; - private BasicTypeLink link; - - public ClassReference(String pack, String name, Link.Kind kind, BasicTypeLink... superClasses) { - this(pack, name, kind, superClasses, new Modifier[0]); - } - - public ClassReference(String pack, String name, Link.Kind kind, BasicTypeLink[] superClasses, - Modifier... modifiers) { - this.pack = pack; - this.name = name; - this.kind = kind; - this.superClasses = superClasses; - this.modifiers = modifiers; - - try { - for (String packageName : PREDEFINED_PACKAGES) { - link = (BasicTypeLink) BasicPackageLink.of(packageName).getType(Tests.stringMatcher(name)); - if (link != null && !link.reflection().getName().endsWith("Test")) { - return; - } - } - link = null; - - } catch (Exception ignored) { - } - } - - public String getName() { - return name; - } - - public boolean isDefined() { - return link != null; - } - - public void assertDefined() { - assertTrue( - isDefined(), - emptyContext(), - r -> String.format("Could not find Type %s. Type is not defined or could not be found.", name) - ); - } - - public void assertCorrectlyDefined() { - assertDefined(); - Context context = contextBuilder() - .add("expected package", pack) - .add("expected kind", kind) - .add("expected name", name) - .add("expected modifier", Arrays.stream(modifiers).map(Modifier::keyword).collect(Collectors.joining(", "))) - .add("package", link.reflection().getPackage().getName()) - .add("kind", link.kind()) - .add("name", link.name()) - .build(); - - assertNotNull(link, context, r -> "Could not find class %s.".formatted(name)); - assertEquals(kind, link.kind(), context, r -> "Kind does not match expected kind."); - assertTrue( - Arrays.stream(modifiers).allMatch(m -> m.is(link.modifiers())), - context, - r -> "The modifiers of the type do not match the expected modifiers." - ); - } - - public void assertNamedCorrectly() { - if (!isDefined()) { - return; - } - Context context = contextBuilder() - .add("expected name", name) - .add("name", link.name()) - .build(); - - assertNotNull(link, context, r -> "Could not find class %s.".formatted(name)); - assertEquals(name, link.name(), context, r -> "The name of the Type does not match the expected name."); - } - - public void assertDefinedInCorrectPackage() { - assertDefined(); - Context context = contextBuilder() - .add("expected package", pack) - .add("expected kind", kind) - .add("expected name", name) - .add("expected modifier", Arrays.stream(modifiers).map(Modifier::keyword).collect(Collectors.joining(", "))) - .add("package", link.reflection().getPackage().getName()) - .add("kind", link.kind()) - .add("name", link.name()) - .build(); - - assertNotNull(link, context, r -> "Could not find class %s.".formatted(name)); - assertEquals( - pack.toLowerCase(), - link.reflection().getPackage().getName().toLowerCase(), - context, - r -> "Package name does not match expected package name." - ); - } - - public BasicTypeLink getLink() { - assertDefined(); - return link; - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/ConvertNumberToPeanoExpressionImplTest.java b/solution/H07/src/graderPrivate/java/h07/ConvertNumberToPeanoExpressionImplTest.java deleted file mode 100644 index 28d5bfe..0000000 --- a/solution/H07/src/graderPrivate/java/h07/ConvertNumberToPeanoExpressionImplTest.java +++ /dev/null @@ -1,92 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; -import org.tudalgo.algoutils.tutor.general.assertions.Assertions2; -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSetTest; -import org.tudalgo.algoutils.tutor.general.reflections.BasicMethodLink; -import spoon.reflect.code.CtLambda; -import spoon.reflect.declaration.CtMethod; - -import java.util.List; - -import static h07.ClassReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL; -import static h07.ClassReference.NUMBER_EXPRESSION; -import static h07.H07Test.getCtElements; -import static h07.MethodReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION_CONVERT; -import static h07.MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.Mockito.CALLS_REAL_METHODS; -import static org.mockito.Mockito.mock; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertEquals; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.contextBuilder; - -@TestForSubmission -public class ConvertNumberToPeanoExpressionImplTest { - - @Test - public void testDefinition() { - CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL.assertDefinedInCorrectPackage(); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "ConvertNumberToPeanoExpressionImpl_X.json") - public void testEvaluate_X(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "ConvertNumberToPeanoExpressionImpl_0.json") - public void testEvaluate_0(JsonParameterSet params) throws Throwable { - performTest(params); - } - - private static void performTest(JsonParameterSet params) throws Throwable { - int x = params.getInt("x"); - - Object numberExpression = NumberConverter.toNumberExpression(x); - - Object mock = mock(CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL.getLink().reflection(), CALLS_REAL_METHODS); - Object returned = CONVERT_NUMBER_TO_PEANO_EXPRESSION_CONVERT.invoke(mock.getClass(), mock, numberExpression); - - Object actualPeano = PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(returned.getClass(), returned); - - int actual = NumberConverter.toNaturalNumber(actualPeano); - - assertEquals(x, actual, params.toContext(), r -> "Value returned by convert() does not match expected."); - } - - @Test - public void testConvertRequirements() { - CtMethod evaluate = - ((BasicMethodLink) CONVERT_NUMBER_TO_PEANO_EXPRESSION_CONVERT.getLink( - CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL.getLink().reflection(), - NUMBER_EXPRESSION.getLink().reflection() - )).getCtElement(); - - getCtElements(List.of(CONVERT_NUMBER_TO_PEANO_EXPRESSION_IMPL.getLink().reflection()), CtLambda.class, evaluate) - .forEach(ctLambda -> { - String body = ctLambda.toStringDebug(); - Context context = contextBuilder().add("Lambda", body).build(); - - Assertions2.assertNull( - ctLambda.getBody(), - context, - r -> "convert() does not use correct lambdas." - ); - } - ); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/ConvertNumberToPeanoExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/ConvertNumberToPeanoExpressionTest.java deleted file mode 100644 index 2b7bede..0000000 --- a/solution/H07/src/graderPrivate/java/h07/ConvertNumberToPeanoExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; - -@TestForSubmission -public class ConvertNumberToPeanoExpressionTest { - - @Test - public void testDefinition() { - ClassReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION.assertCorrectlyDefined(); - MethodReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION_CONVERT.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION.assertNamedCorrectly(); - MethodReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION_CONVERT.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION.assertDefinedInCorrectPackage(); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/ConvertPeanoToNumberExpressionImplTest.java b/solution/H07/src/graderPrivate/java/h07/ConvertPeanoToNumberExpressionImplTest.java deleted file mode 100644 index 3f0081e..0000000 --- a/solution/H07/src/graderPrivate/java/h07/ConvertPeanoToNumberExpressionImplTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; -import org.tudalgo.algoutils.tutor.general.assertions.Assertions2; -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSetTest; -import org.tudalgo.algoutils.tutor.general.reflections.BasicMethodLink; -import spoon.reflect.code.CtLambda; -import spoon.reflect.declaration.CtMethod; - -import java.util.List; - -import static h07.ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL; -import static h07.ClassReference.PEANO_NUMBER_EXPRESSION; -import static h07.H07Test.getCtElements; -import static h07.MethodReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_CONVERT; -import static h07.MethodReference.NUMBER_EXPRESSION_EVALUATE; -import static h07.MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.Mockito.CALLS_REAL_METHODS; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertEquals; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.contextBuilder; - -@TestForSubmission -public class ConvertPeanoToNumberExpressionImplTest { - - @Test - public void testDefinition() { - ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL.assertDefinedInCorrectPackage(); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "ConvertPeanoToNumberExpressionImpl_X.json") - public void testEvaluate_X(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "ConvertPeanoToNumberExpressionImpl_0.json") - public void testEvaluate_0(JsonParameterSet params) throws Throwable { - performTest(params); - } - - private static void performTest(JsonParameterSet params) throws Throwable { - int x = params.getInt("x"); - - Object numberExpression = mock(PEANO_NUMBER_EXPRESSION.getLink().reflection()); - when(PEANO_NUMBER_EXPRESSION_EVALUATE.invoke( - numberExpression.getClass(), - numberExpression - )).thenReturn(NumberConverter.toPeanoNumber(x)); - - Object mock = mock(CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL.getLink().reflection(), CALLS_REAL_METHODS); - Object returned = CONVERT_PEANO_TO_NUMBER_EXPRESSION_CONVERT.invoke(mock.getClass(), mock, numberExpression); - - int actual = NUMBER_EXPRESSION_EVALUATE.invoke(returned.getClass(), returned); - - assertEquals(x, actual, params.toContext("expected"), r -> "Value returned by convert() does not match expected."); - } - - @Test - public void testConvertRequirements() { - CtMethod evaluate = - ((BasicMethodLink) CONVERT_PEANO_TO_NUMBER_EXPRESSION_CONVERT.getLink( - CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL.getLink().reflection(), - PEANO_NUMBER_EXPRESSION.getLink().reflection() - )).getCtElement(); - - getCtElements(List.of(CONVERT_PEANO_TO_NUMBER_EXPRESSION_IMPL.getLink().reflection()), CtLambda.class, evaluate) - .forEach(ctLambda -> { - String body = ctLambda.toStringDebug(); - Context context = contextBuilder().add("Lambda", body).build(); - - Assertions2.assertNull( - ctLambda.getBody(), - context, - r -> "convert() does not use correct lambdas." - ); - } - ); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/ConvertPeanoToNumberExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/ConvertPeanoToNumberExpressionTest.java deleted file mode 100644 index 89f80de..0000000 --- a/solution/H07/src/graderPrivate/java/h07/ConvertPeanoToNumberExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; - -@TestForSubmission -public class ConvertPeanoToNumberExpressionTest { - - @Test - public void testDefinition() { - ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION.assertCorrectlyDefined(); - MethodReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_CONVERT.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION.assertNamedCorrectly(); - MethodReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION_CONVERT.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION.assertDefinedInCorrectPackage(); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/H07Test.java b/solution/H07/src/graderPrivate/java/h07/H07Test.java deleted file mode 100644 index 4f40fb2..0000000 --- a/solution/H07/src/graderPrivate/java/h07/H07Test.java +++ /dev/null @@ -1,59 +0,0 @@ -package h07; - -import org.mockito.MockMakers; -import org.mockito.MockSettings; -import org.sourcegrade.jagr.api.testing.TestCycle; -import org.sourcegrade.jagr.api.testing.extension.TestCycleResolver; -import org.tudalgo.algoutils.tutor.general.reflections.BasicMethodLink; -import spoon.reflect.code.CtBodyHolder; -import spoon.reflect.code.CtInvocation; -import spoon.reflect.declaration.CtElement; -import spoon.reflect.declaration.CtMethod; -import spoon.reflect.visitor.filter.TypeFilter; - -import java.util.List; -import java.util.stream.Stream; - -import static org.mockito.Mockito.withSettings; - -public class H07Test { - - public MockSettings getSettings() { - - TestCycle cycle = TestCycleResolver.getTestCycle(); - - if (cycle != null) { - Thread.currentThread() - .setContextClassLoader((ClassLoader) TestCycleResolver.getTestCycle().getClassLoader()); - return withSettings().mockMaker(MockMakers.PROXY); - } - - return withSettings(); - } - - public static Stream getCtElements(final List> classesToSearch, final Class toSearch, - final CtBodyHolder bodyHolder) { - return bodyHolder.getElements(new TypeFilter<>(CtElement.class) { - @Override - public boolean matches(final CtElement element) { - return (toSearch.isInstance(element) || (element instanceof CtInvocation)) - && classesToSearch.contains(element.getParent(CtMethod.class).getDeclaringType().getActualClass()); - } - }) - .stream() - .filter(ctElement -> !ctElement.equals(bodyHolder)) - .flatMap(element -> { - if (element instanceof final CtInvocation call) { - final var calledMethod = call.getExecutable(); - if (calledMethod.getDeclaringType() == null - || !calledMethod.getDeclaringType().getQualifiedName().startsWith("h00.")) { - return Stream.of(); - } - final var actualCalledMethod = calledMethod.getActualMethod(); - final CtMethod calledMethodCt = BasicMethodLink.of(actualCalledMethod).getCtElement(); - return getCtElements(classesToSearch, toSearch, calledMethodCt); - } - return Stream.of((T) element); - }); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/H07_RubricProvider.java b/solution/H07/src/graderPrivate/java/h07/H07_RubricProvider.java deleted file mode 100644 index 60e3b91..0000000 --- a/solution/H07/src/graderPrivate/java/h07/H07_RubricProvider.java +++ /dev/null @@ -1,333 +0,0 @@ -package h07; - -import static org.tudalgo.algoutils.tutor.general.jagr.RubricUtils.criterion; - -import org.sourcegrade.jagr.api.rubric.Criterion; -import org.sourcegrade.jagr.api.rubric.JUnitTestRef; -import org.sourcegrade.jagr.api.rubric.Rubric; -import org.sourcegrade.jagr.api.rubric.RubricProvider; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; - -public class H07_RubricProvider implements RubricProvider { - - private static final Criterion H7_1_1 = Criterion.builder() - .shortDescription("H7.1.1 | NumberExpression") - .maxPoints(2) - .minPoints(0) - .addChildCriteria( - criterion( - "Das Interface NumberExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod(() -> NumberExpressionTest.class.getMethod("testDefinition"))), - criterion( - "Das Interface PeanoNumberExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod(() -> PeanoNumberExpressionTest.class.getMethod("testDefinition")))) - .build(); - - private static final Criterion H7_1_2 = Criterion.builder() - .shortDescription("H7.1.2 | ArithmeticExpression") - .maxPoints(2) - .minPoints(0) - .addChildCriteria( - criterion( - "Das Interface ArithmeticExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod(() -> ArithmeticExpressionTest.class.getMethod("testDefinition"))), - criterion( - "Das Interface PeanoArithmeticExpression wurde korrekt erstellt.", - JUnitTestRef - .ofMethod(() -> PeanoArithmeticExpressionTest.class.getMethod("testDefinition")))) - .build(); - - private static final Criterion H7_1 = Criterion.builder() - .shortDescription("H7.1 | Interfaces definieren") - .minPoints(0) - .addChildCriteria( - H7_1_1, - H7_1_2, - criterion( - "Alle Klassen und Methoden wurden korrekt benannt.", - -1, - JUnitTestRef.and( - JUnitTestRef.ofMethod(() -> NumberExpressionTest.class.getMethod("testNaming")), - JUnitTestRef - .ofMethod(() -> PeanoNumberExpressionTest.class.getMethod("testNaming")), - JUnitTestRef.ofMethod(() -> ArithmeticExpressionTest.class.getMethod("testNaming")), - JUnitTestRef.ofMethod( - () -> PeanoArithmeticExpressionTest.class.getMethod("testNaming")))), - criterion( - "Alle Klassen wurden im korrekten package definiert.", - -1, - JUnitTestRef.and( - JUnitTestRef.ofMethod(() -> NumberExpressionTest.class.getMethod("testPackage")), - JUnitTestRef - .ofMethod(() -> PeanoNumberExpressionTest.class.getMethod("testPackage")), - JUnitTestRef - .ofMethod(() -> ArithmeticExpressionTest.class.getMethod("testPackage")), - JUnitTestRef.ofMethod( - () -> PeanoArithmeticExpressionTest.class.getMethod("testPackage"))))) - .build(); - - private static final Criterion H7_2_1 = Criterion.builder() - .shortDescription("H7.2.1 | Multiplikationstabelle") - .maxPoints(3) - .minPoints(0) - .addChildCriteria( - criterion( - "Für ArithmeticExpression wurden nur Lambda-Ausdrücke in Standardform und für NumberExpression nur " - + "Lambda-Ausdrücke in Kurzform verwendet.", - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class - .getMethod("testMultiplicationTableRequirements"))), - criterion( - "Die Multiplikationstabelle gibt für lowerBound = upperBound die korrekten Werte aus.", - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class.getMethod( - "multiplicationTableSimple", - JsonParameterSet.class))), - criterion( - "Die Multiplikationstabelle gibt für komplexere lowerBound und upperBound Werte die korrekten Werte aus.", - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class.getMethod( - "multiplicationTableComplex", - JsonParameterSet.class)))) - .build(); - - private static final Criterion H7_2 = Criterion.builder() - .shortDescription("H7.2 | Multiplikationstabelle") - .minPoints(0) - .addChildCriteria( - H7_2_1) - .build(); - - private static final Criterion H7_3_1 = Criterion.builder() - .shortDescription("H7.3.1 | PeanoAddExpression") - .minPoints(0) - .maxPoints(5) - .addChildCriteria( - criterion( - "Die Klasse PeanoAddExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod(() -> PeanoAddExpressionTest.class.getMethod("testDefinition"))), - criterion( - "Die Methode evaluate gibt für X + 0 das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> PeanoAddExpressionTest.class.getMethod("testEvaluate_X0", - JsonParameterSet.class))), - criterion( - "Die Methode evaluate gibt für 0 + X das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> PeanoAddExpressionTest.class.getMethod("testEvaluate_0X", - JsonParameterSet.class))), - criterion( - "Die Methode evaluate gibt für X + Y das korrekte Ergebnis zurück.", - 2, - JUnitTestRef.ofMethod(() -> PeanoAddExpressionTest.class.getMethod("testEvaluate_XY", - JsonParameterSet.class))), - criterion( - "Verbindliche Anforderung nicht erfüllt", - -2, - JUnitTestRef.ofMethod( - () -> PeanoAddExpressionTest.class.getMethod("testEvaluateRequirements")))) - .build(); - - private static final Criterion H7_3_2 = Criterion.builder() - .shortDescription("H7.3.2 | PeanoMultiplyExpression") - .minPoints(0) - .maxPoints(5) - .addChildCriteria( - criterion( - "Die Klasse PeanoMultiplyExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod(() -> PeanoMultiplyExpressionTest.class.getMethod("testDefinition"))), - criterion( - "Die Methode evaluate gibt für X * 0 das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> PeanoMultiplyExpressionTest.class.getMethod( - "testEvaluate_X0", - JsonParameterSet.class))), - criterion( - "Die Methode evaluate gibt für 0 * X das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> PeanoMultiplyExpressionTest.class.getMethod( - "testEvaluate_0X", - JsonParameterSet.class))), - criterion( - "Die Methode evaluate gibt für X * Y das korrekte Ergebnis zurück.", - 2, - JUnitTestRef.ofMethod(() -> PeanoMultiplyExpressionTest.class.getMethod( - "testEvaluate_XY", - JsonParameterSet.class))), - criterion( - "Verbindliche Anforderung nicht erfüllt", - -2, - JUnitTestRef.ofMethod( - () -> PeanoMultiplyExpressionTest.class.getMethod("testEvaluateRequirements")))) - .build(); - - private static final Criterion H7_3 = Criterion.builder() - .shortDescription("H7.3 | Peano Arithmetik") - .minPoints(0) - .addChildCriteria( - H7_3_1, - H7_3_2, - criterion( - "Alle Klassen und Methoden wurden korrekt benannt.", - -1, - JUnitTestRef.and( - JUnitTestRef.ofMethod(() -> PeanoAddExpressionTest.class.getMethod("testNaming")), - JUnitTestRef.ofMethod( - () -> PeanoMultiplyExpressionTest.class.getMethod("testNaming")))), - criterion( - "Alle Klassen wurden im korrekten package definiert.", - -1, - JUnitTestRef.and( - JUnitTestRef.ofMethod(() -> PeanoAddExpressionTest.class.getMethod("testPackage")), - JUnitTestRef.ofMethod( - () -> PeanoMultiplyExpressionTest.class.getMethod("testPackage"))))) - .build(); - - private static final Criterion H7_4_1 = Criterion.builder() - .shortDescription("H7.4.1 | Interfaces für Map erstellen") - .maxPoints(2) - .minPoints(0) - .addChildCriteria( - criterion( - "Das Interface ConvertNumberToPeanoExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod( - () -> ConvertNumberToPeanoExpressionTest.class.getMethod("testDefinition"))), - criterion( - "Das Interface ConvertPeanoToNumberExpression wurde korrekt erstellt.", - JUnitTestRef.ofMethod( - () -> ConvertPeanoToNumberExpressionTest.class.getMethod("testDefinition")))) - .build(); - - private static final Criterion H7_4_2 = Criterion.builder() - .shortDescription("H7.4.2 | Conversions Implementieren") - .maxPoints(7) - .minPoints(0) - .addChildCriteria( - criterion( - "Die Klasse ConvertNumberToPeanoExpressionImpl wurde korrekt erstellt.", - JUnitTestRef.ofMethod( - () -> ConvertNumberToPeanoExpressionImplTest.class.getMethod("testDefinition"))), - criterion( - "Die Methode convert von ConvertNumberToPeanoExpressionImpl gibt für 0 das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> ConvertNumberToPeanoExpressionImplTest.class.getMethod( - "testEvaluate_0", - JsonParameterSet.class))), - criterion( - "Die Methode convert von ConvertNumberToPeanoExpressionImpl gibt für X das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> ConvertNumberToPeanoExpressionImplTest.class.getMethod( - "testEvaluate_X", - JsonParameterSet.class))), - criterion( - "Die Klasse ConvertPeanoToNumberExpressionImpl wurde korrekt erstellt.", - JUnitTestRef.ofMethod( - () -> ConvertPeanoToNumberExpressionImplTest.class.getMethod("testDefinition"))), - criterion( - "Die Methode convert von ConvertPeanoToNumberExpressionImpl gibt für 0 das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> ConvertPeanoToNumberExpressionImplTest.class.getMethod( - "testEvaluate_0", - JsonParameterSet.class))), - criterion( - "Die Methode convert von ConvertPeanoToNumberExpressionImpl gibt für X das korrekte Ergebnis zurück.", - 2, - JUnitTestRef.ofMethod(() -> ConvertPeanoToNumberExpressionImplTest.class.getMethod( - "testEvaluate_X", - JsonParameterSet.class)))) - .build(); - - private static final Criterion H7_4_3 = Criterion.builder() - .shortDescription("H7.4.3 | Von Zahlen zu Peano-Zahlen") - .maxPoints(1) - .minPoints(0) - .addChildCriteria( - criterion( - "Die Methode fromNumberExpressions in PeanoNumberExpressionFactory wandelt einen Array von NumberExpressions " - + "korrekt um.", - JUnitTestRef.ofMethod(() -> PeanoNumberExpressionFactoryTest.class - .getMethod("testFromNumberExpressions", JsonParameterSet.class)))) - .build(); - - private static final Criterion H7_4_4 = Criterion.builder() - .shortDescription("H7.4.4 | Filter") - .maxPoints(3) - .minPoints(0) - .addChildCriteria( - criterion( - "Filter gibt für ein leeres Array ein leeres Array zurück.", - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class.getMethod("filter_empty", - JsonParameterSet.class))), - criterion( - "Filter gibt für ein Predicate, das immer true ist, das gesamte Array zurück und für ein Predicate, das immer " - + "false ist, ein leeres Array.", - JUnitTestRef.and( - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class.getMethod( - "filter_true", - JsonParameterSet.class)), - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class.getMethod( - "filter_false", - JsonParameterSet.class)))), - criterion( - "Filter gibt für ein Predicate, welches nur durch vier teilbare Zahlen akzeptiert, nur die durch drei teilbaren" - + " Zahlen zurück.", - JUnitTestRef.ofMethod(() -> NumberExpressionFactoryTest.class.getMethod("filter_complex", - JsonParameterSet.class)))) - .build(); - - private static final Criterion H7_4_5 = Criterion.builder() - .shortDescription("H7.4.5 | Fold") - .maxPoints(2) - .minPoints(0) - .addChildCriteria( - criterion( - "Fold gibt für ein leeres Array das Initial zurück.", - JUnitTestRef.ofMethod(() -> PeanoNumberExpressionFactoryTest.class.getMethod( - "fold_empty", - JsonParameterSet.class))), - criterion( - "Fold gibt für ein Array mit mehreren Elementen das korrekte Ergebnis zurück.", - JUnitTestRef.ofMethod(() -> PeanoNumberExpressionFactoryTest.class.getMethod( - "fold_filled", - JsonParameterSet.class)))) - .build(); - - private static final Criterion H7_4 = Criterion.builder() - .shortDescription("H7.4 | Funktionen höherer Ordnung") - .minPoints(0) - .addChildCriteria( - H7_4_1, - H7_4_2, - H7_4_3, - H7_4_4, - H7_4_5, - criterion( - "Alle Klassen und Methoden wurden korrekt benannt.", - -1, - JUnitTestRef.and( - JUnitTestRef.ofMethod( - () -> ConvertNumberToPeanoExpressionTest.class.getMethod("testNaming")), - JUnitTestRef.ofMethod( - () -> ConvertPeanoToNumberExpressionTest.class.getMethod("testNaming")), - JUnitTestRef.ofMethod( - () -> ConvertNumberToPeanoExpressionImplTest.class.getMethod("testNaming")), - JUnitTestRef.ofMethod(() -> ConvertPeanoToNumberExpressionImplTest.class - .getMethod("testNaming")))), - criterion( - "Alle Klassen wurden im korrekten package definiert.", - -1, - JUnitTestRef.and( - JUnitTestRef.ofMethod( - () -> ConvertNumberToPeanoExpressionTest.class.getMethod("testPackage")), - JUnitTestRef.ofMethod( - () -> ConvertPeanoToNumberExpressionTest.class.getMethod("testPackage")), - JUnitTestRef.ofMethod(() -> ConvertNumberToPeanoExpressionImplTest.class - .getMethod("testPackage")), - JUnitTestRef.ofMethod(() -> ConvertPeanoToNumberExpressionImplTest.class - .getMethod("testPackage"))))) - .build(); - - public static final Rubric RUBRIC = Rubric.builder() - .title("H07 | Peano Arithmetik") - .addChildCriteria( - H7_1, - H7_2, - H7_3, - H7_4) - .build(); - - @Override - public Rubric getRubric() { - return RUBRIC; - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/MethodReference.java b/solution/H07/src/graderPrivate/java/h07/MethodReference.java deleted file mode 100644 index 4e32076..0000000 --- a/solution/H07/src/graderPrivate/java/h07/MethodReference.java +++ /dev/null @@ -1,446 +0,0 @@ -package h07; - -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.match.Matcher; -import org.tudalgo.algoutils.tutor.general.reflections.BasicConstructorLink; -import org.tudalgo.algoutils.tutor.general.reflections.BasicTypeLink; -import org.tudalgo.algoutils.tutor.general.reflections.ConstructorLink; -import org.tudalgo.algoutils.tutor.general.reflections.Link; -import org.tudalgo.algoutils.tutor.general.reflections.MethodLink; -import org.tudalgo.algoutils.tutor.general.reflections.Modifier; -import org.tudalgo.algoutils.tutor.general.reflections.TypeLink; -import org.tudalgo.algoutils.tutor.general.reflections.WithModifiers; - -import java.lang.reflect.Executable; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static h07.ClassReference.ARITHMETIC_EXPRESSION; -import static h07.ClassReference.CONVERT_NUMBER_TO_PEANO_EXPRESSION; -import static h07.ClassReference.CONVERT_PEANO_TO_NUMBER_EXPRESSION; -import static h07.ClassReference.NUMBER_EXPRESSION; -import static h07.ClassReference.PEANO_ARITHMETIC_EXPRESSION; -import static h07.ClassReference.PEANO_NUMBER_EXPRESSION; -import static org.mockito.Mockito.mock; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertEquals; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertNotNull; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertTrue; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.contextBuilder; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.fail; -import static org.tudalgo.algoutils.tutor.general.reflections.Modifier.PUBLIC; - -public class MethodReference { - - public static final MethodReference NUMBER_EXPRESSION_EVALUATE = - new MethodReference(NUMBER_EXPRESSION, "evaluate", new Modifier[] {PUBLIC}, int.class, new Class[] {}); - public static final MethodReference PEANO_NUMBER_EXPRESSION_EVALUATE = - new MethodReference(PEANO_NUMBER_EXPRESSION, "evaluate", new Modifier[] {PUBLIC}, ClassReference.NATURAL_NUMBER.getLink().reflection(), new Class[] {}); - public static final MethodReference ARITHMETIC_EXPRESSION_EVALUATE = new MethodReference(ARITHMETIC_EXPRESSION, - "evaluate", - new Modifier[] {PUBLIC}, - NUMBER_EXPRESSION.getLink().reflection(), - NUMBER_EXPRESSION, - NUMBER_EXPRESSION - ); - public static final MethodReference PEANO_ARITHMETIC_EXPRESSION_EVALUATE = new MethodReference(PEANO_ARITHMETIC_EXPRESSION, - "evaluate", - new Modifier[] {PUBLIC}, - PEANO_NUMBER_EXPRESSION.getLink().reflection(), - PEANO_NUMBER_EXPRESSION, - PEANO_NUMBER_EXPRESSION - ); - public static final MethodReference CONVERT_NUMBER_TO_PEANO_EXPRESSION_CONVERT = new MethodReference( - CONVERT_NUMBER_TO_PEANO_EXPRESSION, - "convert", - new Modifier[] {PUBLIC}, - PEANO_NUMBER_EXPRESSION.getLink().reflection(), - NUMBER_EXPRESSION - ); - public static final MethodReference CONVERT_PEANO_TO_NUMBER_EXPRESSION_CONVERT = new MethodReference( - CONVERT_PEANO_TO_NUMBER_EXPRESSION, - "convert", - new Modifier[] {PUBLIC}, - NUMBER_EXPRESSION.getLink().reflection(), - PEANO_NUMBER_EXPRESSION - ); - - private final boolean isConstructor; - private final String name; - private final List parameterClassNames; - private final Modifier[] expectedModifiers; - private final Link.Kind kind; - private final ClassReference clazz; - private Class[] parameters; - private MethodLink methodLink; - private ConstructorLink constructorLink; - - public MethodReference(ClassReference clazz, Modifier[] expectedModifiers, Class... parameters) { - this.name = Link.Kind.CONSTRUCTOR.name(); - this.parameters = parameters; - this.parameterClassNames = Arrays.stream(parameters).map(Class::getName).toList(); - this.isConstructor = true; - this.expectedModifiers = expectedModifiers; - this.kind = Link.Kind.CONSTRUCTOR; - this.clazz = clazz; - if (!clazz.isDefined()) { - return; - } - try { - constructorLink = BasicConstructorLink.of(clazz.getLink().reflection().getDeclaredConstructor(parameters)); - } catch (NoSuchMethodException ignored) { - } - } - - public MethodReference(ClassReference clazz, Modifier[] expectedModifiers, ClassReference... parameters) { - this.name = Link.Kind.CONSTRUCTOR.name(); - this.parameterClassNames = Arrays.stream(parameters).map(ClassReference::getName).toList(); - this.isConstructor = true; - this.expectedModifiers = expectedModifiers; - this.kind = Link.Kind.CONSTRUCTOR; - this.clazz = clazz; - if (!clazz.isDefined()) { - return; - } - for (ClassReference ref : parameters) { - if (!ref.isDefined()) { - return; - } - } - this.parameters = Arrays.stream(parameters).map(p -> p.getLink().reflection()).toArray(Class[]::new); - try { - constructorLink = BasicConstructorLink.of( - clazz.getLink().reflection().getDeclaredConstructor( - Arrays.stream(parameters).map(p -> p.getLink().reflection()).toArray(Class[]::new) - ) - ); - } catch (NoSuchMethodException ignored) { - } - } - - public MethodReference(ClassReference clazz, String name, Modifier[] expectedModifiers, Class returnValue, - Class... parameters) { - this.name = name; - this.parameters = parameters; - this.parameterClassNames = Arrays.stream(parameters).map(Class::getName).toList(); - this.isConstructor = false; - this.expectedModifiers = expectedModifiers; - this.kind = Link.Kind.METHOD; - this.clazz = clazz; - if (!clazz.isDefined()) { - return; - } - methodLink = clazz.getLink().getMethod(Tests.stringMatcher(name)); - } - - public MethodReference(ClassReference clazz, String name, Modifier[] expectedModifiers, Class returnValue, - ClassReference... parameters) { - this.name = name; - this.isConstructor = false; - this.expectedModifiers = expectedModifiers; - this.parameterClassNames = Arrays.stream(parameters).map(ClassReference::getName).toList(); - this.kind = Link.Kind.METHOD; - this.clazz = clazz; - if (!clazz.isDefined()) { - return; - } - for (ClassReference ref : parameters) { - if (!ref.isDefined()) { - return; - } - } - this.parameters = Arrays.stream(parameters).map(p -> p.getLink().reflection()).toArray(Class[]::new); - methodLink = clazz.getLink().getMethod(Tests.stringMatcher(name)); - - } - - public WithModifiers getLink() { - return methodLink != null ? methodLink : constructorLink; - } - - public WithModifiers getLink(Class calledClass, Class... parameters) { - MethodLink actual = BasicTypeLink.of(calledClass).getMethod(Tests.stringMatcher(name)); - if (actual != null) { - List> actualParameters = actual.typeList().stream().map(TypeLink::reflection).collect(Collectors.toList()); - - Map, Integer> occurrencesActual = actualParameters.stream().collect(Collectors.groupingBy( - obj -> obj, - Collectors.summingInt(obj -> 1) - )); - Map, Integer> occurrencesExpected = Arrays.stream(parameters).collect(Collectors.groupingBy( - obj -> obj == null ? MethodReference.class : obj, - Collectors.summingInt(obj -> 1) - )); - - boolean hasCorrectParams = Arrays.stream(parameters).allMatch( - param -> actualParameters.stream().anyMatch( - actualParam -> param == null || (actualParam.isAssignableFrom(param) - && occurrencesActual.getOrDefault(actualParam, 0) >= occurrencesExpected.getOrDefault(param, 0)) - ) - ); - if (parameters.length != actualParameters.size() || !hasCorrectParams) { - return null; - } - methodLink = actual; - return actual; - } - if (!clazz.isDefined()) { - return null; - } - if (isConstructor) { - ConstructorLink link = clazz.getLink().getConstructor( - Matcher.of( - (c) -> { - List> types = c.typeList().stream().map(TypeLink::reflection).toList(); - if (parameters == null || types.size() != parameters.length) { - return false; - } - for (int i = 0; i < types.size(); i++) { - if (parameters[i] == null || !types.get(i).isAssignableFrom(parameters[i])) { - return false; - } - } - return true; - } - ) - ); - constructorLink = link; - return link; - } - return null; - } - - public WithModifiers assertDefined(Class calledClass, Class... parameters) { - Context context = contextBuilder() - .add("expected class", clazz.getName()) - .add("expected kind", kind) - .add("expected name", name) - .add("expected parameter", parameterClassNames) - .build(); - MethodLink actual = BasicTypeLink.of(calledClass).getMethod(Tests.stringMatcher(name)); - if (actual != null) { - - List> actualParameters = actual.typeList().stream().map(TypeLink::reflection).collect(Collectors.toList()); - - Map, Integer> occurrencesActual = actualParameters.stream().collect(Collectors.groupingBy( - obj -> obj, - Collectors.summingInt(obj -> 1) - )); - Map, Integer> occurrencesExpected = Arrays.stream(parameters).collect(Collectors.groupingBy( - obj -> obj == null ? MethodReference.class : obj, - Collectors.summingInt(obj -> 1) - )); - - boolean hasCorrectParams = Arrays.stream(parameters).allMatch( - param -> actualParameters.stream().anyMatch( - actualParam -> param == null || (actualParam.isAssignableFrom(param) - && occurrencesActual.getOrDefault(actualParam, 0) >= occurrencesExpected.getOrDefault(param, 0)) - ) - ); - - context = contextBuilder() - .add(context) - .add("actual Parameters", actualParameters) - .add("called with", Arrays.toString(parameters)) - .build(); - - assertEquals( - parameters.length, - actualParameters.size(), - context, - r -> String.format("%s does not have the right number of parameters", name) - ); - - assertTrue( - hasCorrectParams, - context, - r -> String.format("%s does not have the right parameters", name) - ); - methodLink = actual; - return actual; - } - if (!clazz.isDefined()) { - fail( - context, - r -> String.format( - "Can not find %s. The Class of the method does not exist or could not be found.", - name - ) - ); - } - if (isConstructor) { - ConstructorLink link = clazz.getLink().getConstructor( - Matcher.of( - (c) -> { - List> types = c.typeList().stream().map(TypeLink::reflection).toList(); - if (parameters == null || types.size() != parameters.length) { - return false; - } - for (int i = 0; i < types.size(); i++) { - if (parameters[i] == null || !types.get(i).isAssignableFrom(parameters[i])) { - return false; - } - } - return true; - } - ) - ); - if (link != null) { - return link; - } - return fail( - context, - r -> String.format( - "Could not find %s in class %s. The constructor does not exist or has wrong Parameters.", - name, - clazz.getLink().name() - ) - ); - } - return fail( - context, - r -> String.format( - "Can not find %s in class %s. The Method does not exist or could not be found.", - name, - calledClass.getName() - ) - ); - } - - public void assertCorrectlyDefined() { - assertDefined(clazz.getLink().reflection(), parameters); - - WithModifiers link = assertDefined(clazz.getLink().reflection(), parameters); - String name = - link.kind() == Link.Kind.METHOD ? ((MethodLink) link).reflection().getName() : Link.Kind.CONSTRUCTOR.name(); - Modifier[] actualModifiers = - Arrays.stream(Modifier.values()).filter(m -> m.is(link.modifiers())).toArray(Modifier[]::new); - Context context = contextBuilder() - .add("expected class", clazz.getLink().name()) - .add("expected kind", kind) - .add("expected name", name) - .add( - "expected modifier", - Arrays.stream(expectedModifiers).map(Modifier::keyword).collect(Collectors.joining(", ")) - ) - .add("class", ((Executable) link.reflection()).getDeclaringClass().getName()) - .add("kind", link.kind()) - .add("name", name) - .add("modifier", Arrays.stream(actualModifiers).map(Modifier::keyword).collect(Collectors.joining(", "))) - .build(); - - assertNotNull(link, context, r -> "Could not find method %s.".formatted(name)); - assertEquals( - clazz.getLink().reflection(), - ((Executable) link.reflection()).getDeclaringClass(), - context, - r -> "Declaring Class does not match expected Class." - ); - assertEquals(link.kind(), link.kind(), context, r -> "Kind does not match expected kind."); - - assertTrue( - Set.of(actualModifiers).containsAll(Set.of(expectedModifiers)), - context, - r -> "The modifiers of the Method do not match the expected modifiers." - ); - } - - public void assertNamedCorrectly() { - WithModifiers link = getLink(clazz.getLink().reflection(), parameters); - if (link == null) { - return; - } - - String name = - link.kind() == Link.Kind.METHOD ? ((MethodLink) link).reflection().getName() : Link.Kind.CONSTRUCTOR.name(); - Context context = contextBuilder() - .add("expected name", name) - .add("name", name) - .build(); - - assertEquals(this.name, name, context, r -> "The name of the Method does not match the expected name."); - } - - public T invoke(Class calledClass, Object instance, Object... parameter) throws Throwable { - Link link = assertDefined( - calledClass, - Arrays.stream(parameter).map(o -> o != null ? o.getClass() : null).toArray(Class[]::new) - ); - if (instance == null && !(link instanceof ConstructorLink)) { - throw new IllegalArgumentException( - "Could not invoke %s.%s() as object that the function should have been called on is null.".formatted( - clazz.getName(), - name - )); - } - if (link instanceof MethodLink l) { - return l.invoke(instance, parameter); - } else if (link instanceof ConstructorLink l) { - return l.invoke(parameter); - } else { - return null; - } - } - - public T invokeBestEffort(Class calledClass, Object instance, Object... parameter) throws Throwable { - WithModifiers link = getLink(); - - if (link == null) { - Context context = contextBuilder() - .add("expected class", clazz.getName()) - .add("expected kind", kind) - .add("expected name", name) - .add("expected parameter", parameterClassNames) - .build(); - fail( - context, - r -> String.format( - "Can not find %s in class %s. The Method does not exist or could not be found.", - name, - calledClass.getName() - ) - ); - } - - Class[] actualParameter = ((Executable) link.reflection()).getParameterTypes(); - - try { - return invoke(calledClass, instance, parameter); - } catch (Throwable ignored) { - ignored.printStackTrace(); - } - if (actualParameter.length == 0) { - if (link instanceof MethodLink l) { - return l.invoke(instance); - } else if (link instanceof ConstructorLink l) { - return l.invoke(); - } else { - return null; - } - } - - Object[] mocks = Arrays.stream(actualParameter) - .map(p -> { - if (p.equals(String.class)) { - return ""; - } - return mock(p); - }) - .toArray(); - for (int i = 0; i < parameter.length && i < mocks.length; i++) { - if (mocks[i].getClass().isAssignableFrom(parameter[i].getClass())) { - mocks[i] = parameter[i]; - } - } - - if (link instanceof MethodLink l) { - return l.invoke(instance, mocks); - } else if (link instanceof ConstructorLink l) { - return l.invoke(mocks); - } else { - return null; - } - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/NumberConverter.java b/solution/H07/src/graderPrivate/java/h07/NumberConverter.java deleted file mode 100644 index fa8be34..0000000 --- a/solution/H07/src/graderPrivate/java/h07/NumberConverter.java +++ /dev/null @@ -1,44 +0,0 @@ -package h07; - -import java.lang.reflect.InvocationTargetException; - -import static h07.ClassReference.NUMBER_EXPRESSION; -import static h07.ClassReference.PEANO_NUMBER_EXPRESSION; -import static h07.MethodReference.NUMBER_EXPRESSION_EVALUATE; -import static h07.MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class NumberConverter { - - public static int toNaturalNumber(Object peanoNumber) { - String representation = peanoNumber.toString(); - return representation.length() - representation.replace("S", "").length(); - } - - public static Object toPeanoNumber(int number) { - Object peanoNumber = null; - try { - peanoNumber = ClassReference.ZERO.getLink().reflection().getConstructor().newInstance(); - - for (int i = 0; i < number; i++) { - peanoNumber = ClassReference.SUCCESSOR.getLink().reflection().getConstructor(ClassReference.NATURAL_NUMBER.getLink().reflection()).newInstance(peanoNumber); - } - return peanoNumber; - } catch (InstantiationException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - public static Object toNumberExpression(int number) throws Throwable { - Object numberExpression = mock(NUMBER_EXPRESSION.getLink().reflection()); - when(NUMBER_EXPRESSION_EVALUATE.invoke(numberExpression.getClass(), numberExpression)).thenReturn(number); - return numberExpression; - } - - public static Object toPeanoNumberExpression(int number) throws Throwable { - Object numberExpression = mock(PEANO_NUMBER_EXPRESSION.getLink().reflection()); - when(PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(numberExpression.getClass(), numberExpression)).thenReturn(toPeanoNumber(number)); - return numberExpression; - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/NumberExpressionFactoryTest.java b/solution/H07/src/graderPrivate/java/h07/NumberExpressionFactoryTest.java deleted file mode 100644 index 9efbe74..0000000 --- a/solution/H07/src/graderPrivate/java/h07/NumberExpressionFactoryTest.java +++ /dev/null @@ -1,219 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; -import org.tudalgo.algoutils.tutor.general.assertions.Assertions2; -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSetTest; -import org.tudalgo.algoutils.tutor.general.match.BasicStringMatchers; -import org.tudalgo.algoutils.tutor.general.reflections.BasicMethodLink; -import org.tudalgo.algoutils.tutor.general.reflections.BasicTypeLink; -import org.tudalgo.algoutils.tutor.general.reflections.MethodLink; -import spoon.reflect.code.CtLambda; -import spoon.reflect.declaration.CtMethod; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.IntPredicate; - -import static h07.ClassReference.NUMBER_EXPRESSION; -import static h07.H07Test.getCtElements; -import static h07.MethodReference.NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.*; - -@TestForSubmission -public class NumberExpressionFactoryTest { - - @ParameterizedTest - @JsonParameterSetTest(value = "NumberExpressionFactory_multiply_Simple.json") - public void multiplicationTableSimple(JsonParameterSet params) throws Throwable { - performTest_multiplication(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "NumberExpressionFactory_multiply_Complex.json") - public void multiplicationTableComplex(JsonParameterSet params) throws Throwable { - performTest_multiplication(params); - } - - private static void performTest_multiplication(JsonParameterSet params) throws Throwable { - int lowerBound = params.getInt("lowerBound"); - int upperBound = params.getInt("upperBound"); - - List expected = new ArrayList<>(); - params.getRootNode().get("expected").forEach(value -> expected.add(value.intValue())); - - Context context = params.toContext(); - - List actualExpressions = multiplicationTable(lowerBound, upperBound); - List actual = actualExpressions.stream().map(expr -> { - try { - return NUMBER_EXPRESSION_EVALUATE.invoke(expr.getClass(), expr); - } catch (Throwable e) { - throw new RuntimeException(e); - } - }).toList(); - - assertEquals(expected, actual, context, r -> "Returned multiplication table does not match expected."); - } - - private static List multiplicationTable(int lowerBound, int upperBound) throws Throwable { - int numberOfNumbers = upperBound - lowerBound + 1; - List baseNumbers = new ArrayList<>(numberOfNumbers); - - for (int i = lowerBound; i <= upperBound; i++) { - - Object expression = NumberConverter.toNumberExpression(i); - baseNumbers.add(expression); - } - - MethodLink multiplicationLink = BasicMethodLink.of(Arrays.stream(NumberExpressionFactory.class.getMethods()) - .filter(method -> method.getParameterCount() == 1 && method.getName().equals("multiplicationTable")) - .findFirst() - .get()); - - if (multiplicationLink == null) { - throw new RuntimeException("Could not find method NumberExpressionFactory.multiplicationTable()"); - } - - Object returned = multiplicationLink.invokeStatic((Object) (baseNumbers.toArray((Object[]) Array.newInstance( - NUMBER_EXPRESSION.getLink().reflection(), - 0 - )))); - - try { - return List.of((Object[]) returned); - } catch (NullPointerException e) { - fail(emptyContext(), r -> "multiplicationTable() returned null or an array containing null"); - } - return null; - } - - @ParameterizedTest - @JsonParameterSetTest(value = "NumberExpressionFactory_filter_empty.json") - public void filter_empty(JsonParameterSet params) throws Throwable { - performTest_filter(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "NumberExpressionFactory_filter_true.json") - public void filter_true(JsonParameterSet params) throws Throwable { - performTest_filter(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "NumberExpressionFactory_filter_false.json") - public void filter_false(JsonParameterSet params) throws Throwable { - performTest_filter(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "NumberExpressionFactory_filter_complex.json") - public void filter_complex(JsonParameterSet params) throws Throwable { - performTest_filter(params); - } - - private static void performTest_filter(JsonParameterSet params) throws Throwable { - List inputs = new ArrayList<>(); - params.getRootNode().get("inputs").forEach(value -> inputs.add(value.intValue())); - - Map filterMappings = new HashMap<>(); - AtomicInteger currentElem = new AtomicInteger(); - params.getRootNode() - .get("filter") - .forEach(value -> filterMappings.put(inputs.get(currentElem.getAndIncrement()), value.booleanValue())); - - List expected = new ArrayList<>(); - params.getRootNode().get("expected").forEach(value -> expected.add(value.intValue())); - - IntPredicate predicate = filterMappings::get; - - List baseNumbers = new ArrayList<>(); - inputs.forEach(input -> { - Object expression = mock(NUMBER_EXPRESSION.getLink().reflection()); - try { - when(NUMBER_EXPRESSION_EVALUATE.invoke(NUMBER_EXPRESSION.getLink().reflection(), expression)).thenReturn(input); - } catch (Throwable e) { - throw new RuntimeException(e); - } - baseNumbers.add(expression); - }); - - MethodLink filterLink = BasicTypeLink.of(NumberExpressionFactory.class) - .getMethod(BasicStringMatchers.identical("filter")); - - if (filterLink == null) { - fail(emptyContext(), r -> "Could not find method NumberExpressionFactory.filter()"); - } - - List actualExpressions = List.of( - filterLink.invokeStatic( - baseNumbers.toArray((Object[]) Array.newInstance(NUMBER_EXPRESSION.getLink().reflection(), 0)), - predicate - ) - ); - List actual = actualExpressions.stream().map(expr -> { - try { - return NUMBER_EXPRESSION_EVALUATE.invoke(expr.getClass(), expr); - } catch (Throwable e) { - throw new RuntimeException(e); - } - }).toList(); - - Context context = contextBuilder() - .add("inputs", inputs) - .add("filter", filterMappings) - .add("expected", expected) - .build(); - - assertEquals(expected, actual, context, r -> "Returned List of expressions does not match expected list."); - } - - @Test - public void testMultiplicationTableRequirements() throws Throwable { - CtMethod multiplicationTable = BasicMethodLink.of(Arrays.stream(NumberExpressionFactory.class.getMethods()) - .filter(method -> method.getParameterCount() == 1 && method.getName().equals("multiplicationTable")) - .findFirst() - .get()) - .getCtElement(); - - List lambdas = - getCtElements(List.of(NumberExpressionFactory.class), CtLambda.class, multiplicationTable).toList(); - boolean hasCorrectLambdas = lambdas.stream() - .anyMatch(ctLambda -> { - if (ctLambda.getBody() == null) { - return false; - } - - List innerLambdas = - getCtElements(List.of(NumberExpressionFactory.class), CtLambda.class, ctLambda).toList(); - - return innerLambdas.size() == 1 && innerLambdas.get(0).getBody() == null; - } - ); - - Assertions2.assertTrue( - hasCorrectLambdas, - contextBuilder().add("Lambdas", lambdas.stream().map(CtLambda::toStringDebug).toList()).build(), - r -> "multiplicationTable() does not use correct lambdas." - ); - - boolean returnsArrayOfLambda = - multiplicationTable(0, 2).stream().allMatch(it -> it.getClass().getName().contains("$$Lambda")); - - Assertions2.assertTrue( - returnsArrayOfLambda, - emptyContext(), - r -> "multiplicationTable() does not return array of objects created from lambdas." - ); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/NumberExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/NumberExpressionTest.java deleted file mode 100644 index 156da9f..0000000 --- a/solution/H07/src/graderPrivate/java/h07/NumberExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; - -@TestForSubmission -public class NumberExpressionTest extends H07Test { - - @Test - public void testDefinition() { - ClassReference.NUMBER_EXPRESSION.assertCorrectlyDefined(); - MethodReference.NUMBER_EXPRESSION_EVALUATE.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.NUMBER_EXPRESSION.assertNamedCorrectly(); - MethodReference.NUMBER_EXPRESSION_EVALUATE.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.NUMBER_EXPRESSION.assertDefinedInCorrectPackage(); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/PeanoAddExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/PeanoAddExpressionTest.java deleted file mode 100644 index 52fa61d..0000000 --- a/solution/H07/src/graderPrivate/java/h07/PeanoAddExpressionTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; -import org.tudalgo.algoutils.tutor.general.assertions.Assertions2; -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSetTest; -import org.tudalgo.algoutils.tutor.general.reflections.BasicMethodLink; -import spoon.reflect.code.CtLambda; -import spoon.reflect.declaration.CtMethod; - -import java.util.List; - -import static h07.ClassReference.PEANO_ADD_EXPRESSION; -import static h07.ClassReference.PEANO_NUMBER_EXPRESSION; -import static h07.H07Test.getCtElements; -import static h07.MethodReference.PEANO_ARITHMETIC_EXPRESSION_EVALUATE; -import static h07.MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.Mockito.CALLS_REAL_METHODS; -import static org.mockito.Mockito.mock; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertEquals; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.contextBuilder; - -@TestForSubmission -public class PeanoAddExpressionTest { - - @Test - public void testDefinition() { - ClassReference.PEANO_ADD_EXPRESSION.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.PEANO_ADD_EXPRESSION.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.PEANO_ADD_EXPRESSION.assertDefinedInCorrectPackage(); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoAddExpression_0X.json") - public void testEvaluate_0X(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoAddExpression_X0.json") - public void testEvaluate_X0(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoAddExpression_XY.json") - public void testEvaluate_XY(JsonParameterSet params) throws Throwable { - performTest(params); - } - - private static void performTest(JsonParameterSet params) throws Throwable { - int x = params.getInt("x"); - int y = params.getInt("y"); - int expected = params.getInt("expected"); - - Object xPeano = NumberConverter.toPeanoNumberExpression(x); - Object yPeano = NumberConverter.toPeanoNumberExpression(y); - - Object mock = mock(PEANO_ADD_EXPRESSION.getLink().reflection(), CALLS_REAL_METHODS); - Object returned = PEANO_ARITHMETIC_EXPRESSION_EVALUATE.invoke(mock.getClass(), mock, xPeano, yPeano); - - Object actualPeano = PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(returned.getClass(), returned); - - int actual = NumberConverter.toNaturalNumber(actualPeano); - - assertEquals( - expected, - actual, - params.toContext("expected"), - r -> "Value returned by PeanoAddExpression does not match expected." - ); - } - - @Test - public void testEvaluateRequirements() { - CtMethod evaluate = - ((BasicMethodLink) PEANO_ARITHMETIC_EXPRESSION_EVALUATE.getLink( - PEANO_ADD_EXPRESSION.getLink().reflection(), - PEANO_NUMBER_EXPRESSION.getLink().reflection(), - PEANO_NUMBER_EXPRESSION.getLink().reflection() - )).getCtElement(); - - getCtElements(List.of(PEANO_ADD_EXPRESSION.getLink().reflection()), CtLambda.class, evaluate) - .forEach(ctLambda -> { - String body = ctLambda.toStringDebug(); - Context context = contextBuilder().add("Lambda", body).build(); - - Assertions2.assertNotNull( - ctLambda.getBody(), - context, - r -> "evaluate() does not use correct lambdas." - ); - } - ); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/PeanoArithmeticExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/PeanoArithmeticExpressionTest.java deleted file mode 100644 index a2fc2d5..0000000 --- a/solution/H07/src/graderPrivate/java/h07/PeanoArithmeticExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; - -@TestForSubmission -public class PeanoArithmeticExpressionTest { - - @Test - public void testDefinition() { - ClassReference.PEANO_ARITHMETIC_EXPRESSION.assertCorrectlyDefined(); - MethodReference.PEANO_ARITHMETIC_EXPRESSION_EVALUATE.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.PEANO_ARITHMETIC_EXPRESSION.assertNamedCorrectly(); - MethodReference.PEANO_ARITHMETIC_EXPRESSION_EVALUATE.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.PEANO_ARITHMETIC_EXPRESSION.assertDefinedInCorrectPackage(); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/PeanoMultiplyExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/PeanoMultiplyExpressionTest.java deleted file mode 100644 index e85c02f..0000000 --- a/solution/H07/src/graderPrivate/java/h07/PeanoMultiplyExpressionTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; -import org.tudalgo.algoutils.tutor.general.assertions.Assertions2; -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSetTest; -import org.tudalgo.algoutils.tutor.general.reflections.BasicMethodLink; -import spoon.reflect.code.CtLambda; -import spoon.reflect.declaration.CtMethod; - -import java.util.List; - -import static h07.ClassReference.PEANO_MULTIPLY_EXPRESSION; -import static h07.ClassReference.PEANO_NUMBER_EXPRESSION; -import static h07.H07Test.getCtElements; -import static h07.MethodReference.PEANO_ARITHMETIC_EXPRESSION_EVALUATE; -import static h07.MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.Mockito.CALLS_REAL_METHODS; -import static org.mockito.Mockito.mock; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.assertEquals; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.contextBuilder; - -@TestForSubmission -public class PeanoMultiplyExpressionTest { - - @Test - public void testDefinition() { - ClassReference.PEANO_MULTIPLY_EXPRESSION.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.PEANO_MULTIPLY_EXPRESSION.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.PEANO_MULTIPLY_EXPRESSION.assertDefinedInCorrectPackage(); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoMultiplyExpression_0X.json") - public void testEvaluate_0X(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoMultiplyExpression_X0.json") - public void testEvaluate_X0(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoMultiplyExpression_XY.json") - public void testEvaluate_XY(JsonParameterSet params) throws Throwable { - performTest(params); - } - - private static void performTest(JsonParameterSet params) throws Throwable { - int x = params.getInt("x"); - int y = params.getInt("y"); - int expected = params.getInt("expected"); - - Object xPeano = NumberConverter.toPeanoNumberExpression(x); - Object yPeano = NumberConverter.toPeanoNumberExpression(y); - - Object mock = mock(PEANO_MULTIPLY_EXPRESSION.getLink().reflection(), CALLS_REAL_METHODS); - Object returned = PEANO_ARITHMETIC_EXPRESSION_EVALUATE.invoke(mock.getClass(), mock, xPeano, yPeano); - - Object actualPeano = PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(returned.getClass(), returned); - - int actual = NumberConverter.toNaturalNumber(actualPeano); - - assertEquals( - expected, - actual, - params.toContext("expected"), - r -> "Value returned by PeanoMultiplyExpression does not match expected." - ); - } - - @Test - public void testEvaluateRequirements() { - CtMethod evaluate = - ((BasicMethodLink) PEANO_ARITHMETIC_EXPRESSION_EVALUATE.getLink( - PEANO_MULTIPLY_EXPRESSION.getLink().reflection(), - PEANO_NUMBER_EXPRESSION.getLink().reflection(), - PEANO_NUMBER_EXPRESSION.getLink().reflection() - )).getCtElement(); - - getCtElements(List.of(PEANO_MULTIPLY_EXPRESSION.getLink().reflection()), CtLambda.class, evaluate) - .forEach(ctLambda -> { - String body = ctLambda.toStringDebug(); - Context context = contextBuilder().add("Lambda", body).build(); - - Assertions2.assertNull( - ctLambda.getBody(), - context, - r -> "evaluate() does not use correct lambdas." - ); - } - ); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/PeanoNumberExpressionFactoryTest.java b/solution/H07/src/graderPrivate/java/h07/PeanoNumberExpressionFactoryTest.java deleted file mode 100644 index 5bfc2fb..0000000 --- a/solution/H07/src/graderPrivate/java/h07/PeanoNumberExpressionFactoryTest.java +++ /dev/null @@ -1,153 +0,0 @@ -package h07; - -import org.junit.jupiter.params.ParameterizedTest; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; -import org.tudalgo.algoutils.tutor.general.assertions.Context; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSet; -import org.tudalgo.algoutils.tutor.general.json.JsonParameterSetTest; -import org.tudalgo.algoutils.tutor.general.match.BasicStringMatchers; -import org.tudalgo.algoutils.tutor.general.reflections.BasicTypeLink; -import org.tudalgo.algoutils.tutor.general.reflections.MethodLink; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.List; - -import static h07.ClassReference.NUMBER_EXPRESSION; -import static h07.ClassReference.PEANO_ARITHMETIC_EXPRESSION; -import static h07.ClassReference.PEANO_NUMBER_EXPRESSION; -import static h07.MethodReference.NUMBER_EXPRESSION_EVALUATE; -import static h07.MethodReference.PEANO_ARITHMETIC_EXPRESSION_EVALUATE; -import static h07.MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.tudalgo.algoutils.tutor.general.assertions.Assertions2.*; - -@TestForSubmission -public class PeanoNumberExpressionFactoryTest { - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoNumberExpressionFactory_empty.json") - public void fold_empty(JsonParameterSet params) throws Throwable { - performTest(params); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoNumberExpressionFactory_filled.json") - public void fold_filled(JsonParameterSet params) throws Throwable { - performTest(params); - } - - private static void performTest(JsonParameterSet params) throws Throwable { - List inputs = new ArrayList<>(); - params.getRootNode().get("inputs").forEach(value -> inputs.add(value.intValue())); - int initial = params.getInt("initial"); - String operation = params.getString("operation"); - - int expected = params.getInt("expected"); - - List peanoInputs = new ArrayList<>(); - inputs.forEach(input -> { - Object expression = null; - try { - expression = NumberConverter.toPeanoNumberExpression(input); - } catch (Throwable e) { - throw new RuntimeException(e); - } - peanoInputs.add(expression); - }); - - Object initialPeano = NumberConverter.toPeanoNumberExpression(initial); - - Object peanoOperation = mock(PEANO_ARITHMETIC_EXPRESSION.getLink().reflection()); - when(PEANO_ARITHMETIC_EXPRESSION_EVALUATE.invoke( - peanoOperation.getClass(), - peanoOperation, - any(), - any() - )).thenAnswer(mock -> { - Object peanoVal1 = mock.getArgument(0); - Object peanoVal2 = mock.getArgument(1); - - int val1 = NumberConverter.toNaturalNumber(PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(peanoVal1.getClass(), peanoVal1)); - int val2 = NumberConverter.toNaturalNumber(PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(peanoVal2.getClass(), peanoVal2)); - - int result = switch (operation) { - case "+" -> val1 + val2; - case "*" -> val1 * val2; - case "*2*" -> val1 * 2 * val2; - default -> 0; - }; - - return NumberConverter.toPeanoNumberExpression(result); - }); - - MethodLink foldLink = BasicTypeLink.of(ClassReference.PEANO_NUMBER_EXPRESSION_FACTORY.getLink().reflection()) - .getMethod(BasicStringMatchers.identical("fold")); - - if (foldLink == null){ - fail(emptyContext(), r -> "Could not find method PeanoNumberExpressionFactory.fold()"); - } - - Object actualPeano = foldLink.invokeStatic( - peanoInputs.toArray((Object[]) Array.newInstance(PEANO_NUMBER_EXPRESSION.getLink().reflection(), 0)), - initialPeano, - peanoOperation - ); - - assertNotNull(actualPeano, params.toContext(), r -> "Fold returned null."); - int actual = - NumberConverter.toNaturalNumber(PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(actualPeano.getClass(), actualPeano)); - - assertEquals(expected, actual, params.toContext(), r -> "Returned value of fold does not match expected."); - } - - @ParameterizedTest - @JsonParameterSetTest(value = "PeanoNumberExpressionFactory_fromNumber.json") - public void testFromNumberExpressions(JsonParameterSet params) throws Throwable { - List inputs = new ArrayList<>(); - params.getRootNode().get("inputs").forEach(value -> inputs.add(value.intValue())); - - List expected = new ArrayList<>(); - params.getRootNode().get("expected").forEach(value -> expected.add(value.intValue())); - - List baseNumbers = new ArrayList<>(); - inputs.forEach(input -> { - Object expression = mock(NUMBER_EXPRESSION.getLink().reflection()); - try { - when(NUMBER_EXPRESSION_EVALUATE.invoke(NUMBER_EXPRESSION.getLink().reflection(), expression)).thenReturn(input); - } catch (Throwable e) { - throw new RuntimeException(e); - } - baseNumbers.add(expression); - }); - - MethodLink fromNumberExpressionsLink = BasicTypeLink.of(ClassReference.PEANO_NUMBER_EXPRESSION_FACTORY.getLink().reflection()) - .getMethod(BasicStringMatchers.identical("fromNumberExpressions")); - - if (fromNumberExpressionsLink == null){ - fail(emptyContext(), r -> "Could not find method PeanoNumberExpressionFactory.fromNumberExpressions()"); - } - - List actualExpressions = List.of( - fromNumberExpressionsLink.invokeStatic( - (Object) baseNumbers.toArray((Object[]) Array.newInstance(NUMBER_EXPRESSION.getLink().reflection(), 0)) - ) - ); - List actual = actualExpressions.stream().map(expr -> { - try { - return NumberConverter.toNaturalNumber(PEANO_NUMBER_EXPRESSION_EVALUATE.invoke(expr.getClass(), expr)); - } catch (Throwable e) { - throw new RuntimeException(e); - } - }).toList(); - - Context context = contextBuilder() - .add("inputs", inputs) - .add("expected", expected) - .build(); - - assertEquals(expected, actual, context, r -> "Returned List of expressions does not match expected list."); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/PeanoNumberExpressionTest.java b/solution/H07/src/graderPrivate/java/h07/PeanoNumberExpressionTest.java deleted file mode 100644 index 3ee0125..0000000 --- a/solution/H07/src/graderPrivate/java/h07/PeanoNumberExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package h07; - -import org.junit.jupiter.api.Test; -import org.sourcegrade.jagr.api.rubric.TestForSubmission; - -@TestForSubmission -public class PeanoNumberExpressionTest { - - @Test - public void testDefinition() { - ClassReference.PEANO_NUMBER_EXPRESSION.assertCorrectlyDefined(); - MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE.assertCorrectlyDefined(); - } - - @Test - public void testNaming() { - ClassReference.PEANO_NUMBER_EXPRESSION.assertNamedCorrectly(); - MethodReference.PEANO_NUMBER_EXPRESSION_EVALUATE.assertNamedCorrectly(); - } - - @Test - public void testPackage() { - ClassReference.PEANO_NUMBER_EXPRESSION.assertDefinedInCorrectPackage(); - } -} diff --git a/solution/H07/src/graderPrivate/java/h07/Tests.java b/solution/H07/src/graderPrivate/java/h07/Tests.java deleted file mode 100644 index 387192f..0000000 --- a/solution/H07/src/graderPrivate/java/h07/Tests.java +++ /dev/null @@ -1,52 +0,0 @@ -package h07; - -import org.tudalgo.algoutils.tutor.general.match.BasicStringMatchers; -import org.tudalgo.algoutils.tutor.general.match.Match; -import org.tudalgo.algoutils.tutor.general.match.Matcher; -import org.tudalgo.algoutils.tutor.general.match.MatcherFactories; -import org.tudalgo.algoutils.tutor.general.match.Stringifiable; - -public class Tests { - - private static final double MINIMUM_SIMILARITY = .75; - - private static final MatcherFactories.StringMatcherFactory STRING_MATCHER_FACTORY = BasicStringMatchers::identical; - - @SuppressWarnings("removal") - public static Matcher stringMatcher(String string) { - - return new Matcher() { - - @Override - public Match match(ST object) { - return new Match<>() { - - final double similarity = - org.tudalgo.algoutils.reflect.TestUtils.similarity(object.string(), string); - - @Override - public boolean matched() { - return similarity >= MINIMUM_SIMILARITY; - } - - @Override - public ST object() { - return object; - } - - @Override - public int compareTo(Match other) { - if (!other.matched()) { - return matched() ? 1 : 0; - } else if (!matched()) { - return -1; - } - double otherSimilarity = - org.tudalgo.algoutils.reflect.TestUtils.similarity(other.object().string(), string); - return Double.compare(similarity, otherSimilarity); - } - }; - } - }; - } -} diff --git a/solution/H07/src/graderPrivate/resources/h07/ConvertNumberToPeanoExpressionImpl_0.json b/solution/H07/src/graderPrivate/resources/h07/ConvertNumberToPeanoExpressionImpl_0.json deleted file mode 100644 index dba233d..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/ConvertNumberToPeanoExpressionImpl_0.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - { - "x": "0" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/ConvertNumberToPeanoExpressionImpl_X.json b/solution/H07/src/graderPrivate/resources/h07/ConvertNumberToPeanoExpressionImpl_X.json deleted file mode 100644 index b980c0d..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/ConvertNumberToPeanoExpressionImpl_X.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "x": "1" - }, - { - "x": "3" - }, - { - "x": "7" - }, - { - "x": "10" - }, - { - "x": "25" - }, - { - "x": "30" - }, - { - "x": "99" - }, - { - "x": "6" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/ConvertPeanoToNumberExpressionImpl_0.json b/solution/H07/src/graderPrivate/resources/h07/ConvertPeanoToNumberExpressionImpl_0.json deleted file mode 100644 index dba233d..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/ConvertPeanoToNumberExpressionImpl_0.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - { - "x": "0" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/ConvertPeanoToNumberExpressionImpl_X.json b/solution/H07/src/graderPrivate/resources/h07/ConvertPeanoToNumberExpressionImpl_X.json deleted file mode 100644 index b980c0d..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/ConvertPeanoToNumberExpressionImpl_X.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "x": "1" - }, - { - "x": "3" - }, - { - "x": "7" - }, - { - "x": "10" - }, - { - "x": "25" - }, - { - "x": "30" - }, - { - "x": "99" - }, - { - "x": "6" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_complex.json b/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_complex.json deleted file mode 100644 index c29c7e4..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_complex.json +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - "inputs": [1,2,3,4,5,6,7,8,9], - "filter": [true, false, true, false, true, false, true, false, true], - "expected": [1,3,5,7,9] - }, - { - "inputs": [1,2,3,4,6,7,8,9], - "filter": [true, true, true, false, false, true, true, true], - "expected": [1,2,3,7,8,9] - }, - { - "inputs": [1,2,3,4,5], - "filter": [true, false, true, true, true], - "expected": [1,3,4,5] - }, - { - "inputs": [2,4,6,8,10], - "filter": [true, true, true, true, false], - "expected": [2,4,6,8] - }, - { - "inputs": [1,2,3,4,5,6,7,8,9], - "filter": [true, true, true, false, true, true, true, true, true], - "expected": [1,2,3,5,6,7,8,9] - }, - { - "inputs": [1,2,3,4,5,6,7,8,9], - "filter": [false, true, true, true, true, true, true, true, true], - "expected": [2,3,4,5,6,7,8,9] - }, - { - "inputs": [1,2,3,4,5,6,7,8,9], - "filter": [true, true, true, true, true, true, true, true, false], - "expected": [1,2,3,4,5,6,7,8] - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_empty.json b/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_empty.json deleted file mode 100644 index 8900765..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_empty.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "inputs": [], - "filter": [], - "expected": [] - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_false.json b/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_false.json deleted file mode 100644 index 30c9a21..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_false.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "inputs": [1,2,3,4,5,6,7,8,9], - "filter": [false, false, false, false, false, false, false, false, false], - "expected": [] - }, - { - "inputs": [1,2,3,4,6,7,8,9], - "filter": [false, false, false, false, false, false, false, false], - "expected": [] - }, - { - "inputs": [1,2,3,4,5], - "filter": [false, false, false, false, false], - "expected": [] - }, - { - "inputs": [2,4,6,8,10], - "filter": [false, false, false, false, false], - "expected": [] - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_true.json b/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_true.json deleted file mode 100644 index edcde5c..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_filter_true.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "inputs": [1,2,3,4,5,6,7,8,9], - "filter": [true, true, true, true, true, true, true, true, true], - "expected": [1,2,3,4,5,6,7,8,9] - }, - { - "inputs": [1,2,3,4,6,7,8,9], - "filter": [true, true, true, true, true, true, true, true], - "expected": [1,2,3,4,6,7,8,9] - }, - { - "inputs": [1,2,3,4,5], - "filter": [true, true, true, true, true], - "expected": [1,2,3,4,5] - }, - { - "inputs": [2,4,6,8,10], - "filter": [true, true, true, true, true], - "expected": [2,4,6,8,10] - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_multiply_Complex.json b/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_multiply_Complex.json deleted file mode 100644 index 2b2461a..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_multiply_Complex.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "lowerBound": "1", - "upperBound": "3", - "expected": [ - 1, 2, 3, 2, 4, 6, 3, 6, 9 - ] - }, - { - "lowerBound": "2", - "upperBound": "5", - "expected": [ - 4, 6, 8, 10, 6, 9, 12, 15, 8, 12, 16, 20, 10, 15, 20, 25 - ] - }, - { - "lowerBound": "3", - "upperBound": "10", - "expected": [ - 9, 12, 15, 18, 21, 24, 27, 30, 12, 16, 20, 24, 28, 32, 36, 40, 15, 20, 25, 30, 35, 40, 45, 50, 18, 24, 30, 36, 42, 48, 54, 60, 21, 28, 35, 42, 49, 56, 63, 70, 24, 32, 40, 48, 56, 64, 72, 80, 27, 36, 45, 54, 63, 72, 81, 90, 30, 40, 50, 60, 70, 80, 90, 100 - ] - }, - { - "lowerBound": "1", - "upperBound": "9", - "expected": [ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 2, 4, 6, 8, 10, 12, 14, 16, 18, 3, 6, 9, 12, 15, 18, 21, 24, 27, 4, 8, 12, 16, 20, 24, 28, 32, 36, 5, 10, 15, 20, 25, 30, 35, 40, 45, 6, 12, 18, 24, 30, 36, 42, 48, 54, 7, 14, 21, 28, 35, 42, 49, 56, 63, 8, 16, 24, 32, 40, 48, 56, 64, 72, 9, 18, 27, 36, 45, 54, 63, 72, 81 - ] - }, - { - "lowerBound": "5", - "upperBound": "7", - "expected": [ - 25, 30, 35, 30, 36, 42, 35, 42, 49 - ] - }, - { - "lowerBound": "1", - "upperBound": "2", - "expected": [ - 1, 2, 2, 4 - ] - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_multiply_Simple.json b/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_multiply_Simple.json deleted file mode 100644 index 7dc5e7c..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/NumberExpressionFactory_multiply_Simple.json +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - "lowerBound": "2", - "upperBound": "2", - "expected": [ - 4 - ] - }, - { - "lowerBound": "1", - "upperBound": "1", - "expected": [ - 1 - ] - }, - { - "lowerBound": "3", - "upperBound": "3", - "expected": [ - 9 - ] - }, - { - "lowerBound": "6", - "upperBound": "6", - "expected": [ - 36 - ] - }, - { - "lowerBound": "10", - "upperBound": "10", - "expected": [ - 100 - ] - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_0X.json b/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_0X.json deleted file mode 100644 index 451abbb..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_0X.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "x": "0", - "y": "1", - "expected": "1" - }, - { - "x": "0", - "y": "2", - "expected": "2" - }, - { - "x": "0", - "y": "3", - "expected": "3" - }, - { - "x": "0", - "y": "5", - "expected": "5" - }, - { - "x": "0", - "y": "9", - "expected": "9" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_X0.json b/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_X0.json deleted file mode 100644 index aa51869..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_X0.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "x": "1", - "y": "0", - "expected": "1" - }, - { - "x": "2", - "y": "0", - "expected": "2" - }, - { - "x": "3", - "y": "0", - "expected": "3" - }, - { - "x": "5", - "y": "0", - "expected": "5" - }, - { - "x": "9", - "y": "0", - "expected": "9" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_XY.json b/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_XY.json deleted file mode 100644 index 0c049c2..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoAddExpression_XY.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "x": "1", - "y": "1", - "expected": "2" - }, - { - "x": "2", - "y": "2", - "expected": "4" - }, - { - "x": "3", - "y": "3", - "expected": "6" - }, - { - "x": "5", - "y": "5", - "expected": "10" - }, - { - "x": "9", - "y": "9", - "expected": "18" - }, - { - "x": "1", - "y": "4", - "expected": "5" - }, - { - "x": "3", - "y": "6", - "expected": "9" - }, - { - "x": "2", - "y": "7", - "expected": "9" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_0X.json b/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_0X.json deleted file mode 100644 index d207587..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_0X.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "x": "0", - "y": "1", - "expected": "0" - }, - { - "x": "0", - "y": "2", - "expected": "0" - }, - { - "x": "0", - "y": "3", - "expected": "0" - }, - { - "x": "0", - "y": "5", - "expected": "0" - }, - { - "x": "0", - "y": "9", - "expected": "0" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_X0.json b/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_X0.json deleted file mode 100644 index 65fdb2f..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_X0.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "x": "1", - "y": "0", - "expected": "0" - }, - { - "x": "2", - "y": "0", - "expected": "0" - }, - { - "x": "3", - "y": "0", - "expected": "0" - }, - { - "x": "5", - "y": "0", - "expected": "0" - }, - { - "x": "9", - "y": "0", - "expected": "0" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_XY.json b/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_XY.json deleted file mode 100644 index 4b37d6f..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoMultiplyExpression_XY.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "x": "1", - "y": "1", - "expected": "1" - }, - { - "x": "2", - "y": "2", - "expected": "4" - }, - { - "x": "3", - "y": "3", - "expected": "9" - }, - { - "x": "5", - "y": "5", - "expected": "25" - }, - { - "x": "9", - "y": "9", - "expected": "81" - }, - { - "x": "1", - "y": "4", - "expected": "4" - }, - { - "x": "3", - "y": "6", - "expected": "18" - }, - { - "x": "2", - "y": "7", - "expected": "14" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_empty.json b/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_empty.json deleted file mode 100644 index 0d742e9..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_empty.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "inputs": [ - - ], - "initial": "5", - "operation": "+", - "expected": "5" - }, - { - "inputs": [ - - ], - "initial": "10", - "operation": "*", - "expected": "10" - }, - { - "inputs": [ - - ], - "initial": "2", - "operation": "*2*", - "expected": "2" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_filled.json b/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_filled.json deleted file mode 100644 index 0b80c60..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_filled.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "inputs": [ - 1,2,3,4 - ], - "initial": "0", - "operation": "+", - "expected": "10" - }, - { - "inputs": [ - 2,3,4,5 - ], - "initial": "1", - "operation": "*", - "expected": "120" - }, - { - "inputs": [ - 2,3,4,5 - ], - "initial": "0", - "operation": "*", - "expected": "0" - }, - { - "inputs": [ - 2,4,6 - ], - "initial": "2", - "operation": "*2*", - "expected": "768" - } -] \ No newline at end of file diff --git a/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_fromNumber.json b/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_fromNumber.json deleted file mode 100644 index ac6f3d2..0000000 --- a/solution/H07/src/graderPrivate/resources/h07/PeanoNumberExpressionFactory_fromNumber.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "inputs": [ - 1,2,3,4 - ], - "expected": [ - 1,2,3,4 - ] - }, - { - "inputs": [ - 2,3,4,5 - ], - "expected": [ - 2,3,4,5 - ] - }, - { - "inputs": [ - 2,3,4,5,6 - ], - "expected": [ - 2,3,4,5,6 - ] - }, - { - "inputs": [ - 2,4,6 - ], - "expected": [ - 2,4,6 - ] - }, - { - "inputs": [ - 100,5,0 - ], - "expected": [ - 100,5,0 - ] - } -] \ No newline at end of file