From 82737ae9736b7208fde2a653ec9dfa45ea8c92da Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Fri, 20 Jun 2025 21:14:32 -0600 Subject: [PATCH 01/11] Set up scaffold for practice exercise: Piecing It Together --- config.json | 12 + .../piecing-it-together/.docs/instructions.md | 41 +++ .../piecing-it-together/.docs/introduction.md | 6 + .../piecing-it-together/.meta/config.json | 19 ++ .../src/reference/java/PiecingItTogether.java | 0 .../piecing-it-together/.meta/tests.toml | 31 +++ .../practice/piecing-it-together/build.gradle | 25 ++ .../practice/piecing-it-together/gradlew | 249 ++++++++++++++++++ .../practice/piecing-it-together/gradlew.bat | 92 +++++++ .../src/test/java/PiecingItTogetherTest.java | 0 exercises/settings.gradle | 1 + 11 files changed, 476 insertions(+) create mode 100644 exercises/practice/piecing-it-together/.docs/instructions.md create mode 100644 exercises/practice/piecing-it-together/.docs/introduction.md create mode 100644 exercises/practice/piecing-it-together/.meta/config.json create mode 100644 exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java create mode 100644 exercises/practice/piecing-it-together/.meta/tests.toml create mode 100644 exercises/practice/piecing-it-together/build.gradle create mode 100755 exercises/practice/piecing-it-together/gradlew create mode 100644 exercises/practice/piecing-it-together/gradlew.bat create mode 100644 exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java diff --git a/config.json b/config.json index 3d1ff49af..1623d2b25 100644 --- a/config.json +++ b/config.json @@ -1307,6 +1307,18 @@ ], "difficulty": 6 }, + { + "slug": "piecing-it-together", + "name": "Piecing It Together", + "uuid": "be303729-ad8a-4f4c-a235-6828a6734f05", + "practices": [], + "prerequisites": [ + "exceptions", + "for-loops", + "if-else-statements" + ], + "difficulty": 6 + }, { "slug": "queen-attack", "name": "Queen Attack", diff --git a/exercises/practice/piecing-it-together/.docs/instructions.md b/exercises/practice/piecing-it-together/.docs/instructions.md new file mode 100644 index 000000000..c0c966592 --- /dev/null +++ b/exercises/practice/piecing-it-together/.docs/instructions.md @@ -0,0 +1,41 @@ +# Instructions + +Given partial information about a jigsaw puzzle, add the missing pieces. + +If the information is insufficient to complete the details, or if given parts are in contradiction, the user should be notified. + +The full information about the jigsaw puzzle contains the following parts: + +- `pieces`: Total number of pieces +- `border`: Number of border pieces +- `inside`: Number of inside (non-border) pieces +- `rows`: Number of rows +- `columns`: Number of columns +- `aspectRatio`: Aspect ratio of columns to rows +- `format`: Puzzle format, which can be `portrait`, `square`, or `landscape` + +For this exercise, you may assume square pieces, so that the format can be derived from the aspect ratio: + +- If the aspect ratio is less than 1, it's `portrait` +- If it is equal to 1, it's `square` +- If it is greater than 1, it's `landscape` + +## Three examples + +### Portrait + +A portrait jigsaw puzzle with 6 pieces, all of which are border pieces and none are inside pieces. It has 3 rows and 2 columns. The aspect ratio is 1.5 (3/2). + +![A 2 by 3 jigsaw puzzle](https://assets.exercism.org/images/exercises/piecing-it-together/jigsaw-puzzle-2x3.svg) + +### Square + +A square jigsaw puzzle with 9 pieces, all of which are border pieces except for the one in the center, which is an inside piece. It has 3 rows and 3 columns. The aspect ratio is 1 (3/3). + +![A 3 by 3 jigsaw puzzle](https://assets.exercism.org/images/exercises/piecing-it-together/jigsaw-puzzle-3x3.svg) + +### Landscape + +A landscape jigsaw puzzle with 12 pieces, 10 of which are border pieces and 2 are inside pieces. It has 3 rows and 4 columns. The aspect ratio is 1.333333... (4/3). + +![A 4 by 3 jigsaw puzzle](https://assets.exercism.org/images/exercises/piecing-it-together/jigsaw-puzzle-4x3.svg) diff --git a/exercises/practice/piecing-it-together/.docs/introduction.md b/exercises/practice/piecing-it-together/.docs/introduction.md new file mode 100644 index 000000000..2fa20f6c5 --- /dev/null +++ b/exercises/practice/piecing-it-together/.docs/introduction.md @@ -0,0 +1,6 @@ +# Introduction + +Your best friend has started collecting jigsaw puzzles and wants to build a detailed catalog of their collection — recording information such as the total number of pieces, the number of rows and columns, the number of border and inside pieces, aspect ratio, and puzzle format. +Even with your powers combined, it takes multiple hours to solve a single jigsaw puzzle with one thousand pieces — and then you still need to count the rows and columns and calculate the remaining numbers manually. +The even larger puzzles with thousands of pieces look quite daunting now. +"There has to be a better way!" you exclaim and sit down in front of your computer to solve the problem. diff --git a/exercises/practice/piecing-it-together/.meta/config.json b/exercises/practice/piecing-it-together/.meta/config.json new file mode 100644 index 000000000..ce6c4d578 --- /dev/null +++ b/exercises/practice/piecing-it-together/.meta/config.json @@ -0,0 +1,19 @@ +{ + "authors": [ + "zamora-carlos" + ], + "files": { + "solution": [ + "src/main/java/PiecingItTogether.java" + ], + "test": [ + "src/test/java/PiecingItTogetherTest.java" + ], + "example": [ + ".meta/src/reference/java/PiecingItTogether.java" + ] + }, + "blurb": "Fill in missing jigsaw puzzle details from partial data", + "source": "atk just started another 1000-pieces jigsaw puzzle when this idea hit him", + "source_url": "https://github.com/exercism/problem-specifications/pull/2554" +} diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/practice/piecing-it-together/.meta/tests.toml b/exercises/practice/piecing-it-together/.meta/tests.toml new file mode 100644 index 000000000..f462c15a3 --- /dev/null +++ b/exercises/practice/piecing-it-together/.meta/tests.toml @@ -0,0 +1,31 @@ +# This is an auto-generated file. +# +# Regenerating this file via `configlet sync` will: +# - Recreate every `description` key/value pair +# - Recreate every `reimplements` key/value pair, where they exist in problem-specifications +# - Remove any `include = true` key/value pair (an omitted `include` key implies inclusion) +# - Preserve any other key/value pair +# +# As user-added comments (using the # character) will be removed when this file +# is regenerated, comments can be added via a `comment` key. + +[ad626f23-09a2-4f5f-ba22-eec0671fa2a9] +description = "1000 pieces puzzle with 1.6 aspect ratio" + +[3e0c5919-3561-42f5-b9ed-26d70c20214e] +description = "square puzzle with 32 rows" + +[1126f160-b094-4dc2-bf37-13e36e394867] +description = "400 pieces square puzzle with only inside pieces and aspect ratio" + +[a9743178-5642-4cc0-8fdb-00d6b031c3a0] +description = "1500 pieces landscape puzzle with 30 rows and 1.6 aspect ratio" + +[f6378369-989c-497f-a6e2-f30b1fa76cba] +description = "300 pieces portrait puzzle with 70 border pieces" + +[f53f82ba-5663-4c7e-9e86-57fdbb3e53d2] +description = "puzzle with insufficient data" + +[a3d5c31a-cc74-44bf-b4fc-9e4d65f1ac1a] +description = "puzzle with contradictory data" diff --git a/exercises/practice/piecing-it-together/build.gradle b/exercises/practice/piecing-it-together/build.gradle new file mode 100644 index 000000000..dd3862eb9 --- /dev/null +++ b/exercises/practice/piecing-it-together/build.gradle @@ -0,0 +1,25 @@ +plugins { + id "java" +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation platform("org.junit:junit-bom:5.10.0") + testImplementation "org.junit.jupiter:junit-jupiter" + testImplementation "org.assertj:assertj-core:3.25.1" + + testRuntimeOnly "org.junit.platform:junit-platform-launcher" +} + +test { + useJUnitPlatform() + + testLogging { + exceptionFormat = "full" + showStandardStreams = true + events = ["passed", "failed", "skipped"] + } +} diff --git a/exercises/practice/piecing-it-together/gradlew b/exercises/practice/piecing-it-together/gradlew new file mode 100755 index 000000000..1aa94a426 --- /dev/null +++ b/exercises/practice/piecing-it-together/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/exercises/practice/piecing-it-together/gradlew.bat b/exercises/practice/piecing-it-together/gradlew.bat new file mode 100644 index 000000000..93e3f59f1 --- /dev/null +++ b/exercises/practice/piecing-it-together/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. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/settings.gradle b/exercises/settings.gradle index 713a0c583..38c04e59a 100644 --- a/exercises/settings.gradle +++ b/exercises/settings.gradle @@ -104,6 +104,7 @@ include 'practice:parallel-letter-frequency' include 'practice:pascals-triangle' include 'practice:perfect-numbers' include 'practice:phone-number' +include 'practice:piecing-it-together' include 'practice:pig-latin' include 'practice:poker' include 'practice:eliuds-eggs' From 4efdb7fd96b98eb8c87ccfcca58d834b0dbf5571 Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sat, 21 Jun 2025 17:04:35 -0600 Subject: [PATCH 02/11] Implement PartialJigsawInformation helper class --- .../java/PartialJigsawInformation.java | 67 +++++++++++++++++++ .../main/java/PartialJigsawInformation.java | 67 +++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java create mode 100644 exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java new file mode 100644 index 000000000..f24ac06de --- /dev/null +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java @@ -0,0 +1,67 @@ +import java.util.Objects; +import java.util.Optional; + +public class PartialJigsawInformation { + private Optional pieces; + private Optional border; + private Optional inside; + private Optional rows; + private Optional columns; + private Optional aspectRatio; + private Optional format; + + public PartialJigsawInformation(Integer pieces, Integer border, Integer inside, Integer rows, Integer columns, Double aspectRatio, String format) { + this.pieces = Optional.ofNullable(pieces); + this.border = Optional.ofNullable(border); + this.inside = Optional.ofNullable(inside); + this.rows = Optional.ofNullable(rows); + this.columns = Optional.ofNullable(columns); + this.aspectRatio = Optional.ofNullable(aspectRatio); + this.format = Optional.ofNullable(format); + } + + public Optional getPieces() { + return pieces; + } + + public Optional getBorder() { + return border; + } + + public Optional getInside() { + return inside; + } + + public Optional getRows() { + return rows; + } + + public Optional getColumns() { + return columns; + } + + public Optional getAspectRatio() { + return aspectRatio; + } + + public Optional getFormat() { + return format; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + PartialJigsawInformation that = (PartialJigsawInformation) o; + return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); + } + + @Override + public int hashCode() { + return Objects.hash(pieces, border, inside, rows, columns, aspectRatio, format); + } + + @Override + public String toString() { + return "PartialJigsawInformation{" + "pieces=" + pieces + ", border=" + border + ", inside=" + inside + ", rows=" + rows + ", columns=" + columns + ", aspectRatio=" + aspectRatio + ", format=" + format + '}'; + } +} diff --git a/exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java b/exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java new file mode 100644 index 000000000..f24ac06de --- /dev/null +++ b/exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java @@ -0,0 +1,67 @@ +import java.util.Objects; +import java.util.Optional; + +public class PartialJigsawInformation { + private Optional pieces; + private Optional border; + private Optional inside; + private Optional rows; + private Optional columns; + private Optional aspectRatio; + private Optional format; + + public PartialJigsawInformation(Integer pieces, Integer border, Integer inside, Integer rows, Integer columns, Double aspectRatio, String format) { + this.pieces = Optional.ofNullable(pieces); + this.border = Optional.ofNullable(border); + this.inside = Optional.ofNullable(inside); + this.rows = Optional.ofNullable(rows); + this.columns = Optional.ofNullable(columns); + this.aspectRatio = Optional.ofNullable(aspectRatio); + this.format = Optional.ofNullable(format); + } + + public Optional getPieces() { + return pieces; + } + + public Optional getBorder() { + return border; + } + + public Optional getInside() { + return inside; + } + + public Optional getRows() { + return rows; + } + + public Optional getColumns() { + return columns; + } + + public Optional getAspectRatio() { + return aspectRatio; + } + + public Optional getFormat() { + return format; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + PartialJigsawInformation that = (PartialJigsawInformation) o; + return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); + } + + @Override + public int hashCode() { + return Objects.hash(pieces, border, inside, rows, columns, aspectRatio, format); + } + + @Override + public String toString() { + return "PartialJigsawInformation{" + "pieces=" + pieces + ", border=" + border + ", inside=" + inside + ", rows=" + rows + ", columns=" + columns + ", aspectRatio=" + aspectRatio + ", format=" + format + '}'; + } +} From 44292bc4d4d6e50b1d69a230e2557fc8eb54ff4a Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sat, 21 Jun 2025 17:06:56 -0600 Subject: [PATCH 03/11] Add unit tests for PiecingItTogether exercise --- .../src/test/java/PiecingItTogetherTest.java | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java index e69de29bb..8794b9513 100644 --- a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java +++ b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java @@ -0,0 +1,100 @@ +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class PiecingItTogetherTest { + private PiecingItTogether solver; + private double epsilon; + + @BeforeEach + public void setup() { + solver = new PiecingItTogether(); + epsilon = 1e-6; + } + + @Test + public void test1000PiecesWithAspectRatio() { + PartialJigsawInformation input = new PartialJigsawInformation(1000, null, null, null, null, 1.6, null); + PartialJigsawInformation expected = new PartialJigsawInformation(1000, 126, 874, 25, 40, 1.6, "landscape"); + + PartialJigsawInformation actual = solver.getCompleteInformation(input); + assertJigsawEqualsWithTolerance(actual, expected); + } + + @Disabled("Remove to run test") + @Test + public void testSquarePuzzleWith32Rows() { + PartialJigsawInformation input = new PartialJigsawInformation(null, null, null, 32, null, null, "square"); + PartialJigsawInformation expected = new PartialJigsawInformation(1024, 124, 900, 32, 32, 1.0, "square"); + + PartialJigsawInformation actual = solver.getCompleteInformation(input); + assertJigsawEqualsWithTolerance(actual, expected); + } + + @Disabled("Remove to run test") + @Test + public void testInsideAndAspectRatioOnly() { + PartialJigsawInformation input = new PartialJigsawInformation(null, null, 324, null, null, 1.0, null); + PartialJigsawInformation expected = new PartialJigsawInformation(400, 76, 324, 20, 20, 1.0, "square"); + + PartialJigsawInformation actual = solver.getCompleteInformation(input); + assertJigsawEqualsWithTolerance(actual, expected); + } + + @Disabled("Remove to run test") + @Test + public void testLandscape1500WithRowsAndAspect() { + PartialJigsawInformation input = new PartialJigsawInformation(null, null, null, 30, null, 1.6666666666666667, null); + PartialJigsawInformation expected = new PartialJigsawInformation(1500, 156, 1344, 30, 50, 1.6666666666666667, "landscape"); + + PartialJigsawInformation actual = solver.getCompleteInformation(input); + assertJigsawEqualsWithTolerance(actual, expected); + } + + @Disabled("Remove to run test") + @Test + public void test300PiecesPortraitWithBorder() { + PartialJigsawInformation input = new PartialJigsawInformation(300, 70, null, null, null, null, "portrait"); + PartialJigsawInformation expected = new PartialJigsawInformation(300, 70, 230, 25, 12, 0.48, "portrait"); + + PartialJigsawInformation actual = solver.getCompleteInformation(input); + assertJigsawEqualsWithTolerance(actual, expected); + } + + @Disabled("Remove to run test") + @Test + public void testInsufficientData() { + PartialJigsawInformation input = new PartialJigsawInformation(1500, null, null, null, null, null, "landscape"); + + assertThatThrownBy(() -> solver.getCompleteInformation(input)).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("Insufficient data"); + } + + @Disabled("Remove to run test") + @Test + public void testContradictoryData() { + PartialJigsawInformation input = new PartialJigsawInformation(null, null, null, 100, 1000, null, "square"); + + assertThatThrownBy(() -> solver.getCompleteInformation(input)).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("Contradictory data"); + } + + /** + * Helper to compare two PartialJigsawInformation objects, + * allowing a small tolerance when comparing aspect ratio doubles. + */ + private void assertJigsawEqualsWithTolerance(PartialJigsawInformation actual, PartialJigsawInformation expected) { + assertThat(actual.getPieces()).isEqualTo(expected.getPieces()); + assertThat(actual.getBorder()).isEqualTo(expected.getBorder()); + assertThat(actual.getInside()).isEqualTo(expected.getInside()); + assertThat(actual.getRows()).isEqualTo(expected.getRows()); + assertThat(actual.getColumns()).isEqualTo(expected.getColumns()); + assertThat(actual.getFormat()).isEqualTo(expected.getFormat()); + + Double actualAspect = actual.getAspectRatio().orElseThrow(() -> new AssertionError("Missing aspect ratio in actual result")); + Double expectedAspect = expected.getAspectRatio().orElseThrow(() -> new AssertionError("Missing aspect ratio in expected result")); + + assertThat(actualAspect).isCloseTo(expectedAspect, org.assertj.core.api.Assertions.within(epsilon)); + } +} From d8fb7292a1ef6e8edb013d664ea81236d04e5b8d Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sat, 21 Jun 2025 17:09:16 -0600 Subject: [PATCH 04/11] Implement reference solution for PiecingItTogether exercise --- .../src/reference/java/PiecingItTogether.java | 309 ++++++++++++++++++ 1 file changed, 309 insertions(+) diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java index e69de29bb..b455068ad 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java @@ -0,0 +1,309 @@ +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +public class PiecingItTogether { + private final double epsilon = 1e-6; + + public PartialJigsawInformation getCompleteInformation(PartialJigsawInformation input) { + Integer rows = input.getRows().orElse(null); + Integer cols = input.getColumns().orElse(null); + Integer pieces = input.getPieces().orElse(null); + Integer border = input.getBorder().orElse(null); + Integer inside = input.getInside().orElse(null); + Double aspect = input.getAspectRatio().orElse(null); + String format = input.getFormat().orElse(null); + + // Final information to be compared with the original input to detect inconsistencies + PartialJigsawInformation result = null; + + // Check format and aspect ratio don't contradict each other or set aspect if format is square + if (format != null && aspect != null) { + if (!format.equals(getFormatFromAspect(aspect))) { + throw new IllegalArgumentException("Contradictory data"); + } + } else if ("square".equalsIgnoreCase(format)) { + aspect = 1.0; + } + + // Derive any missing value among pieces, border, and inside + if (pieces != null && border != null && inside != null) { + if (pieces != border + inside) { + throw new IllegalArgumentException("Contradictory data"); + } + } else if (pieces != null && border != null) { + inside = pieces - border; + } else if (border != null && inside != null) { + pieces = border + inside; + } else if (inside != null && pieces != null) { + border = pieces - inside; + } + + // Try to compute missing information using the numbers of rows and cols + if (rows != null && cols != null) { + result = fromRowsAndCols(rows, cols); + } else if (rows != null) { + Optional possibleCols = calculateOtherSide(rows, true, pieces, border, inside, aspect); + + if (possibleCols.isPresent()) { + cols = possibleCols.get(); + result = fromRowsAndCols(rows, cols); + } + } else if (cols != null) { + Optional possibleRows = calculateOtherSide(cols, false, pieces, border, inside, aspect); + + if (possibleRows.isPresent()) { + rows = possibleRows.get(); + result = fromRowsAndCols(rows, cols); + } + } + + if (result != null) { + checkConsistencyOrThrow(result, input); + return result; + } + + // Try to compute missing information using the value of aspect ratio + if (aspect != null) { + if (pieces != null) { + double actualRows = Math.sqrt(pieces / aspect); + rows = roundIfClose(actualRows); + + double actualCols = aspect * rows; + cols = roundIfClose(actualCols); + + result = fromRowsAndCols(rows, cols); + checkConsistencyOrThrow(result, input); + return result; + } else if (inside != null && inside == 0) { + List validGuesses = new ArrayList<>(); + + for (int fixed : List.of(1, 2)) { + tryGuessWithFixedSide(fixed, true, aspect, input).ifPresent(validGuesses::add); // rows = fixed + tryGuessWithFixedSide(fixed, false, aspect, input).ifPresent(validGuesses::add); // cols = fixed + } + + if (validGuesses.size() == 1) { + return validGuesses.getFirst(); + } else if (validGuesses.size() > 1) { + throw new IllegalArgumentException("Insufficient data"); + } else { + throw new IllegalArgumentException("Contradictory data"); + } + } + } + + if (pieces == null && border == null && (inside == null || inside == 0)) { + throw new IllegalArgumentException("Insufficient data"); + } + + // Brute force as a last resort + List validGuesses = new ArrayList<>(); + + // Brute-force using pieces + if (pieces != null) { + for (int r = 1; r <= pieces; r++) { + if (pieces % r != 0) { + continue; // cols must be integer + } + + int c = pieces / r; + tryGuess(r, c, input).ifPresent(validGuesses::add); + } + } else if (inside != null) { + for (int r = 3; r <= inside + 2; r++) { + int innerRows = r - 2; + if (inside % innerRows != 0) { + continue; + } + + int innerCols = inside / innerRows; + int c = innerCols + 2; + + tryGuess(r, c, input).ifPresent(validGuesses::add); + } + } else { + int max = Math.min(border, 1000); + + for (int r = 1; r <= max; r++) { + for (int c = 1; c <= max; c++) { + tryGuess(r, c, input).ifPresent(validGuesses::add); + } + } + } + + if (validGuesses.size() == 1) { + return validGuesses.getFirst(); + } else if (validGuesses.size() > 1) { + throw new IllegalArgumentException("Insufficient data"); + } else { + throw new IllegalArgumentException("Contradictory data"); + } + } + + private String getFormatFromAspect(double aspectRatio) { + String format; + + if (Math.abs(aspectRatio - 1.0) < epsilon) { + format = "square"; + } else if (aspectRatio < 1.0) { + format = "portrait"; + } else { + format = "landscape"; + } + + return format; + } + + private Integer roundIfClose(double value) { + double rounded = Math.round(value); + + if (Math.abs(value - rounded) < epsilon) { + return (int) rounded; + } + + throw new IllegalArgumentException("Contradictory data"); + } + + private int calculateOtherSideFromPieces(int knownSide, int pieces) { + if (pieces <= 0 || pieces % knownSide != 0) { + throw new IllegalArgumentException("Contradictory data"); + } + + return pieces / knownSide; + } + + private int calculateOtherSideFromBorder(int knownSide, int border) { + if (knownSide == 1) { + return border; + } + + if (knownSide == border) { + return 1; + } + + if ((border + 4 <= 2 * knownSide) || border % 2 != 0) { + throw new IllegalArgumentException("Contradictory data"); + } + + return ((border + 4) - 2 * knownSide) / 2; + } + + private int calculateOtherSideFromInside(int knownSide, int inside) { + if (knownSide <= 2 || inside % (knownSide - 2) != 0) { + throw new IllegalArgumentException("Contradictory data"); + } + + return (inside / (knownSide - 2)) + 2; + } + + private Optional calculateOtherSide(int knownSide, boolean isRowKnown, Integer pieces, Integer border, Integer inside, Double aspect) { + if (pieces != null) { + return Optional.of(calculateOtherSideFromPieces(knownSide, pieces)); + } else if (border != null) { + return Optional.of(calculateOtherSideFromBorder(knownSide, border)); + } else if (aspect != null) { + double raw = isRowKnown ? knownSide * aspect : knownSide / aspect; + return Optional.of(roundIfClose(raw)); + } else if (inside != null) { + if (inside == 0) { + // When inside is zero and all other values (otherSide, pieces, border, aspect) are unknown, + // it only tells us that either rows or cols is 1 or 2, but provides no way to infer the rest. + // Since we can't make any further assumptions, we stop here. + throw new IllegalArgumentException("Insufficient data"); + } + + return Optional.of(calculateOtherSideFromInside(knownSide, inside)); + } + + return Optional.empty(); + } + + private PartialJigsawInformation fromRowsAndCols(int rows, int cols) { + int pieces = rows * cols; + int border = (rows == 1 || cols == 1) ? pieces : 2 * (rows + cols - 2); + int inside = pieces - border; + double aspect = (double) cols / rows; + String format = getFormatFromAspect(aspect); + + return new PartialJigsawInformation(pieces, border, inside, rows, cols, aspect, format); + } + + /** + * Verifies that all known values in the input match those in the computed result. + * If any known value in the input contradicts the corresponding computed value, + * an IllegalArgumentException is thrown. + * + * @param computed the fully inferred jigsaw information + * @param input the original partial input with possibly known values + * @throws IllegalArgumentException if any known value in the input conflicts with the computed result + */ + public void checkConsistencyOrThrow(PartialJigsawInformation computed, PartialJigsawInformation input) { + if (!valuesMatch(computed.getPieces(), input.getPieces()) || !valuesMatch(computed.getBorder(), input.getBorder()) || !valuesMatch(computed.getInside(), input.getInside()) || !valuesMatch(computed.getRows(), input.getRows()) || !valuesMatch(computed.getColumns(), input.getColumns()) || !valuesMatch(computed.getAspectRatio(), input.getAspectRatio()) || !valuesMatch(computed.getFormat(), input.getFormat())) { + throw new IllegalArgumentException("Contradictory data"); + } + } + + /** + * Attempts to compute a valid jigsaw configuration by fixing one dimension + * (either rows or columns) and inferring the other using the aspect ratio. + * + * @param fixed the known size of one side (either rows or columns) + * @param isRowFixed true if the fixed value represents rows, false if columns + * @param aspect the desired aspect ratio (cols / rows) + * @param input the original input to check for consistency + * @return an Optional containing a valid inferred configuration, or empty if the guess is invalid + */ + private Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed, double aspect, PartialJigsawInformation input) { + try { + int other = isRowFixed ? roundIfClose(fixed * aspect) : roundIfClose(fixed / aspect); + + int rows = isRowFixed ? fixed : other; + int cols = isRowFixed ? other : fixed; + + PartialJigsawInformation guess = fromRowsAndCols(rows, cols); + checkConsistencyOrThrow(guess, input); + return Optional.of(guess); + } catch (IllegalArgumentException ignored) { + return Optional.empty(); + } + } + + /** + * Attempts to construct a jigsaw configuration using the specified number of rows and columns. + * Returns a valid result only if the configuration is consistent with the input. + * + * @param rows number of rows to try + * @param cols number of columns to try + * @param input the original input to check for consistency + * @return an Optional containing a valid configuration, or empty if inconsistent + */ + private Optional tryGuess(int rows, int cols, PartialJigsawInformation input) { + try { + PartialJigsawInformation guess = fromRowsAndCols(rows, cols); + checkConsistencyOrThrow(guess, input); + return Optional.of(guess); + } catch (IllegalArgumentException ignored) { + return Optional.empty(); + } + } + + /** + * Compares two optional values for equality. + * Returns true if either value is absent, or if both are present and equal. + * Used to check consistency between inferred and input data. + * + * @param a the first optional value + * @param b the second optional value + * @param the type of the contained values + * @return true if the values are consistent (both missing or equal if present), false otherwise + */ + private boolean valuesMatch(Optional a, Optional b) { + if (a.isPresent() && b.isPresent()) { + return Objects.equals(a.get(), b.get()); + } + + return true; + } +} \ No newline at end of file From bc92ec4ef55e7f2f6aeff868826e2c7dd036cc3f Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sat, 21 Jun 2025 17:43:16 -0600 Subject: [PATCH 05/11] Add stub file for PiecingItTogether exercise --- .../piecing-it-together/src/main/java/PiecingItTogether.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java diff --git a/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java new file mode 100644 index 000000000..23e117deb --- /dev/null +++ b/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java @@ -0,0 +1,5 @@ +public class PiecingItTogether { + public PartialJigsawInformation getCompleteInformation(PartialJigsawInformation input) { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } +} From 2c82a8ea79809e7f1a30f71cb5f924d6925a3b78 Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sun, 22 Jun 2025 12:47:08 -0600 Subject: [PATCH 06/11] Add Gradle wrapper and update editor config for piecing-it-together exercise --- .../piecing-it-together/.meta/config.json | 3 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 exercises/practice/piecing-it-together/gradle/wrapper/gradle-wrapper.jar create mode 100644 exercises/practice/piecing-it-together/gradle/wrapper/gradle-wrapper.properties diff --git a/exercises/practice/piecing-it-together/.meta/config.json b/exercises/practice/piecing-it-together/.meta/config.json index ce6c4d578..a5d7327bc 100644 --- a/exercises/practice/piecing-it-together/.meta/config.json +++ b/exercises/practice/piecing-it-together/.meta/config.json @@ -11,6 +11,9 @@ ], "example": [ ".meta/src/reference/java/PiecingItTogether.java" + ], + "editor": [ + ".meta/src/reference/java/PartialJigsawInformation.java" ] }, "blurb": "Fill in missing jigsaw puzzle details from partial data", diff --git a/exercises/practice/piecing-it-together/gradle/wrapper/gradle-wrapper.jar b/exercises/practice/piecing-it-together/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 Date: Sun, 22 Jun 2025 12:51:52 -0600 Subject: [PATCH 07/11] Refactor PartialJigsawInformation to JigsawInfo with builder pattern and type improvements --- .../piecing-it-together/.meta/config.json | 2 +- .../.meta/src/reference/java/JigsawInfo.java | 131 ++++++++++++++++++ .../java/PartialJigsawInformation.java | 67 --------- .../src/reference/java/PiecingItTogether.java | 63 ++++++--- .../src/main/java/JigsawInfo.java | 131 ++++++++++++++++++ .../main/java/PartialJigsawInformation.java | 67 --------- .../src/main/java/PiecingItTogether.java | 2 +- .../src/test/java/PiecingItTogetherTest.java | 128 +++++++++++++---- 8 files changed, 406 insertions(+), 185 deletions(-) create mode 100644 exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java delete mode 100644 exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java create mode 100644 exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java delete mode 100644 exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java diff --git a/exercises/practice/piecing-it-together/.meta/config.json b/exercises/practice/piecing-it-together/.meta/config.json index a5d7327bc..d507bf844 100644 --- a/exercises/practice/piecing-it-together/.meta/config.json +++ b/exercises/practice/piecing-it-together/.meta/config.json @@ -13,7 +13,7 @@ ".meta/src/reference/java/PiecingItTogether.java" ], "editor": [ - ".meta/src/reference/java/PartialJigsawInformation.java" + ".meta/src/reference/java/JigsawInfo.java" ] }, "blurb": "Fill in missing jigsaw puzzle details from partial data", diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java new file mode 100644 index 000000000..094889571 --- /dev/null +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java @@ -0,0 +1,131 @@ +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; + +/** + * Represents partial or complete information about a jigsaw puzzle, + * + * NOTE: There is no need to change this file and is treated as read only by the Exercism test runners. + */ +public class JigsawInfo { + private final OptionalInt pieces; + private final OptionalInt border; + private final OptionalInt inside; + private final OptionalInt rows; + private final OptionalInt columns; + private final OptionalDouble aspectRatio; + private final Optional format; + + private JigsawInfo(Builder builder) { + this.pieces = builder.pieces != null ? OptionalInt.of(builder.pieces) : OptionalInt.empty(); + this.border = builder.border != null ? OptionalInt.of(builder.border) : OptionalInt.empty(); + this.inside = builder.inside != null ? OptionalInt.of(builder.inside) : OptionalInt.empty(); + this.rows = builder.rows != null ? OptionalInt.of(builder.rows) : OptionalInt.empty(); + this.columns = builder.columns != null ? OptionalInt.of(builder.columns) : OptionalInt.empty(); + this.aspectRatio = builder.aspectRatio != null ? OptionalDouble.of(builder.aspectRatio) : OptionalDouble.empty(); + this.format = Optional.ofNullable(builder.format); + } + + public static class Builder { + private Integer pieces; + private Integer border; + private Integer inside; + private Integer rows; + private Integer columns; + private Double aspectRatio; + private String format; + + public Builder pieces(Integer pieces) { + this.pieces = pieces; + return this; + } + + public Builder border(Integer border) { + this.border = border; + return this; + } + + public Builder inside(Integer inside) { + this.inside = inside; + return this; + } + + public Builder rows(Integer rows) { + this.rows = rows; + return this; + } + + public Builder columns(Integer columns) { + this.columns = columns; + return this; + } + + public Builder aspectRatio(Double aspectRatio) { + this.aspectRatio = aspectRatio; + return this; + } + + public Builder format(String format) { + this.format = format; + return this; + } + + public JigsawInfo build() { + return new JigsawInfo(this); + } + } + + public OptionalInt getPieces() { + return pieces; + } + + public OptionalInt getBorder() { + return border; + } + + public OptionalInt getInside() { + return inside; + } + + public OptionalInt getRows() { + return rows; + } + + public OptionalInt getColumns() { + return columns; + } + + public OptionalDouble getAspectRatio() { + return aspectRatio; + } + + public Optional getFormat() { + return format; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + JigsawInfo that = (JigsawInfo) o; + return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); + } + + @Override + public int hashCode() { + return Objects.hash(pieces, border, inside, rows, columns, aspectRatio, format); + } + + @Override + public String toString() { + return "JigsawInfo{" + + "pieces=" + pieces + + ", border=" + border + + ", inside=" + inside + + ", rows=" + rows + + ", columns=" + columns + + ", aspectRatio=" + aspectRatio + + ", format=" + format + + '}'; + } +} diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java deleted file mode 100644 index f24ac06de..000000000 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PartialJigsawInformation.java +++ /dev/null @@ -1,67 +0,0 @@ -import java.util.Objects; -import java.util.Optional; - -public class PartialJigsawInformation { - private Optional pieces; - private Optional border; - private Optional inside; - private Optional rows; - private Optional columns; - private Optional aspectRatio; - private Optional format; - - public PartialJigsawInformation(Integer pieces, Integer border, Integer inside, Integer rows, Integer columns, Double aspectRatio, String format) { - this.pieces = Optional.ofNullable(pieces); - this.border = Optional.ofNullable(border); - this.inside = Optional.ofNullable(inside); - this.rows = Optional.ofNullable(rows); - this.columns = Optional.ofNullable(columns); - this.aspectRatio = Optional.ofNullable(aspectRatio); - this.format = Optional.ofNullable(format); - } - - public Optional getPieces() { - return pieces; - } - - public Optional getBorder() { - return border; - } - - public Optional getInside() { - return inside; - } - - public Optional getRows() { - return rows; - } - - public Optional getColumns() { - return columns; - } - - public Optional getAspectRatio() { - return aspectRatio; - } - - public Optional getFormat() { - return format; - } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - PartialJigsawInformation that = (PartialJigsawInformation) o; - return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); - } - - @Override - public int hashCode() { - return Objects.hash(pieces, border, inside, rows, columns, aspectRatio, format); - } - - @Override - public String toString() { - return "PartialJigsawInformation{" + "pieces=" + pieces + ", border=" + border + ", inside=" + inside + ", rows=" + rows + ", columns=" + columns + ", aspectRatio=" + aspectRatio + ", format=" + format + '}'; - } -} diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java index b455068ad..96cfe8183 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java @@ -1,22 +1,19 @@ -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; public class PiecingItTogether { private final double epsilon = 1e-6; - public PartialJigsawInformation getCompleteInformation(PartialJigsawInformation input) { - Integer rows = input.getRows().orElse(null); - Integer cols = input.getColumns().orElse(null); - Integer pieces = input.getPieces().orElse(null); - Integer border = input.getBorder().orElse(null); - Integer inside = input.getInside().orElse(null); - Double aspect = input.getAspectRatio().orElse(null); + public JigsawInfo getCompleteInformation(JigsawInfo input) { + Integer rows = input.getRows().isPresent() ? input.getRows().getAsInt() : null; + Integer cols = input.getColumns().isPresent() ? input.getColumns().getAsInt() : null; + Integer pieces = input.getPieces().isPresent() ? input.getPieces().getAsInt() : null; + Integer border = input.getBorder().isPresent() ? input.getBorder().getAsInt() : null; + Integer inside = input.getInside().isPresent() ? input.getInside().getAsInt() : null; + Double aspect = input.getAspectRatio().isPresent() ? input.getAspectRatio().getAsDouble() : null; String format = input.getFormat().orElse(null); // Final information to be compared with the original input to detect inconsistencies - PartialJigsawInformation result = null; + JigsawInfo result = null; // Check format and aspect ratio don't contradict each other or set aspect if format is square if (format != null && aspect != null) { @@ -77,7 +74,7 @@ public PartialJigsawInformation getCompleteInformation(PartialJigsawInformation checkConsistencyOrThrow(result, input); return result; } else if (inside != null && inside == 0) { - List validGuesses = new ArrayList<>(); + List validGuesses = new ArrayList<>(); for (int fixed : List.of(1, 2)) { tryGuessWithFixedSide(fixed, true, aspect, input).ifPresent(validGuesses::add); // rows = fixed @@ -99,7 +96,7 @@ public PartialJigsawInformation getCompleteInformation(PartialJigsawInformation } // Brute force as a last resort - List validGuesses = new ArrayList<>(); + List validGuesses = new ArrayList<>(); // Brute-force using pieces if (pieces != null) { @@ -220,14 +217,22 @@ private Optional calculateOtherSide(int knownSide, boolean isRowKnown, return Optional.empty(); } - private PartialJigsawInformation fromRowsAndCols(int rows, int cols) { + private JigsawInfo fromRowsAndCols(int rows, int cols) { int pieces = rows * cols; int border = (rows == 1 || cols == 1) ? pieces : 2 * (rows + cols - 2); int inside = pieces - border; double aspect = (double) cols / rows; String format = getFormatFromAspect(aspect); - return new PartialJigsawInformation(pieces, border, inside, rows, cols, aspect, format); + return new JigsawInfo.Builder() + .pieces(pieces) + .border(border) + .inside(inside) + .rows(rows) + .columns(cols) + .aspectRatio(aspect) + .format(format) + .build(); } /** @@ -239,7 +244,7 @@ private PartialJigsawInformation fromRowsAndCols(int rows, int cols) { * @param input the original partial input with possibly known values * @throws IllegalArgumentException if any known value in the input conflicts with the computed result */ - public void checkConsistencyOrThrow(PartialJigsawInformation computed, PartialJigsawInformation input) { + public void checkConsistencyOrThrow(JigsawInfo computed, JigsawInfo input) { if (!valuesMatch(computed.getPieces(), input.getPieces()) || !valuesMatch(computed.getBorder(), input.getBorder()) || !valuesMatch(computed.getInside(), input.getInside()) || !valuesMatch(computed.getRows(), input.getRows()) || !valuesMatch(computed.getColumns(), input.getColumns()) || !valuesMatch(computed.getAspectRatio(), input.getAspectRatio()) || !valuesMatch(computed.getFormat(), input.getFormat())) { throw new IllegalArgumentException("Contradictory data"); } @@ -255,14 +260,14 @@ public void checkConsistencyOrThrow(PartialJigsawInformation computed, PartialJi * @param input the original input to check for consistency * @return an Optional containing a valid inferred configuration, or empty if the guess is invalid */ - private Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed, double aspect, PartialJigsawInformation input) { + private Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed, double aspect, JigsawInfo input) { try { int other = isRowFixed ? roundIfClose(fixed * aspect) : roundIfClose(fixed / aspect); int rows = isRowFixed ? fixed : other; int cols = isRowFixed ? other : fixed; - PartialJigsawInformation guess = fromRowsAndCols(rows, cols); + JigsawInfo guess = fromRowsAndCols(rows, cols); checkConsistencyOrThrow(guess, input); return Optional.of(guess); } catch (IllegalArgumentException ignored) { @@ -279,9 +284,9 @@ private Optional tryGuessWithFixedSide(int fixed, bool * @param input the original input to check for consistency * @return an Optional containing a valid configuration, or empty if inconsistent */ - private Optional tryGuess(int rows, int cols, PartialJigsawInformation input) { + private Optional tryGuess(int rows, int cols, JigsawInfo input) { try { - PartialJigsawInformation guess = fromRowsAndCols(rows, cols); + JigsawInfo guess = fromRowsAndCols(rows, cols); checkConsistencyOrThrow(guess, input); return Optional.of(guess); } catch (IllegalArgumentException ignored) { @@ -306,4 +311,20 @@ private boolean valuesMatch(Optional a, Optional b) { return true; } + + private boolean valuesMatch(OptionalInt a, OptionalInt b) { + if (a.isPresent() && b.isPresent()) { + return a.getAsInt() == b.getAsInt(); + } + + return true; + } + + private boolean valuesMatch(OptionalDouble a, OptionalDouble b) { + if (a.isPresent() && b.isPresent()) { + return Double.compare(a.getAsDouble(), b.getAsDouble()) == 0; + } + + return true; + } } \ No newline at end of file diff --git a/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java b/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java new file mode 100644 index 000000000..094889571 --- /dev/null +++ b/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java @@ -0,0 +1,131 @@ +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; + +/** + * Represents partial or complete information about a jigsaw puzzle, + * + * NOTE: There is no need to change this file and is treated as read only by the Exercism test runners. + */ +public class JigsawInfo { + private final OptionalInt pieces; + private final OptionalInt border; + private final OptionalInt inside; + private final OptionalInt rows; + private final OptionalInt columns; + private final OptionalDouble aspectRatio; + private final Optional format; + + private JigsawInfo(Builder builder) { + this.pieces = builder.pieces != null ? OptionalInt.of(builder.pieces) : OptionalInt.empty(); + this.border = builder.border != null ? OptionalInt.of(builder.border) : OptionalInt.empty(); + this.inside = builder.inside != null ? OptionalInt.of(builder.inside) : OptionalInt.empty(); + this.rows = builder.rows != null ? OptionalInt.of(builder.rows) : OptionalInt.empty(); + this.columns = builder.columns != null ? OptionalInt.of(builder.columns) : OptionalInt.empty(); + this.aspectRatio = builder.aspectRatio != null ? OptionalDouble.of(builder.aspectRatio) : OptionalDouble.empty(); + this.format = Optional.ofNullable(builder.format); + } + + public static class Builder { + private Integer pieces; + private Integer border; + private Integer inside; + private Integer rows; + private Integer columns; + private Double aspectRatio; + private String format; + + public Builder pieces(Integer pieces) { + this.pieces = pieces; + return this; + } + + public Builder border(Integer border) { + this.border = border; + return this; + } + + public Builder inside(Integer inside) { + this.inside = inside; + return this; + } + + public Builder rows(Integer rows) { + this.rows = rows; + return this; + } + + public Builder columns(Integer columns) { + this.columns = columns; + return this; + } + + public Builder aspectRatio(Double aspectRatio) { + this.aspectRatio = aspectRatio; + return this; + } + + public Builder format(String format) { + this.format = format; + return this; + } + + public JigsawInfo build() { + return new JigsawInfo(this); + } + } + + public OptionalInt getPieces() { + return pieces; + } + + public OptionalInt getBorder() { + return border; + } + + public OptionalInt getInside() { + return inside; + } + + public OptionalInt getRows() { + return rows; + } + + public OptionalInt getColumns() { + return columns; + } + + public OptionalDouble getAspectRatio() { + return aspectRatio; + } + + public Optional getFormat() { + return format; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + JigsawInfo that = (JigsawInfo) o; + return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); + } + + @Override + public int hashCode() { + return Objects.hash(pieces, border, inside, rows, columns, aspectRatio, format); + } + + @Override + public String toString() { + return "JigsawInfo{" + + "pieces=" + pieces + + ", border=" + border + + ", inside=" + inside + + ", rows=" + rows + + ", columns=" + columns + + ", aspectRatio=" + aspectRatio + + ", format=" + format + + '}'; + } +} diff --git a/exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java b/exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java deleted file mode 100644 index f24ac06de..000000000 --- a/exercises/practice/piecing-it-together/src/main/java/PartialJigsawInformation.java +++ /dev/null @@ -1,67 +0,0 @@ -import java.util.Objects; -import java.util.Optional; - -public class PartialJigsawInformation { - private Optional pieces; - private Optional border; - private Optional inside; - private Optional rows; - private Optional columns; - private Optional aspectRatio; - private Optional format; - - public PartialJigsawInformation(Integer pieces, Integer border, Integer inside, Integer rows, Integer columns, Double aspectRatio, String format) { - this.pieces = Optional.ofNullable(pieces); - this.border = Optional.ofNullable(border); - this.inside = Optional.ofNullable(inside); - this.rows = Optional.ofNullable(rows); - this.columns = Optional.ofNullable(columns); - this.aspectRatio = Optional.ofNullable(aspectRatio); - this.format = Optional.ofNullable(format); - } - - public Optional getPieces() { - return pieces; - } - - public Optional getBorder() { - return border; - } - - public Optional getInside() { - return inside; - } - - public Optional getRows() { - return rows; - } - - public Optional getColumns() { - return columns; - } - - public Optional getAspectRatio() { - return aspectRatio; - } - - public Optional getFormat() { - return format; - } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - PartialJigsawInformation that = (PartialJigsawInformation) o; - return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); - } - - @Override - public int hashCode() { - return Objects.hash(pieces, border, inside, rows, columns, aspectRatio, format); - } - - @Override - public String toString() { - return "PartialJigsawInformation{" + "pieces=" + pieces + ", border=" + border + ", inside=" + inside + ", rows=" + rows + ", columns=" + columns + ", aspectRatio=" + aspectRatio + ", format=" + format + '}'; - } -} diff --git a/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java index 23e117deb..c098f46a5 100644 --- a/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java @@ -1,5 +1,5 @@ public class PiecingItTogether { - public PartialJigsawInformation getCompleteInformation(PartialJigsawInformation input) { + public JigsawInfo getCompleteInformation(JigsawInfo input) { throw new UnsupportedOperationException("Delete this statement and write your own implementation."); } } diff --git a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java index 8794b9513..7aec36a08 100644 --- a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java +++ b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java @@ -17,74 +17,146 @@ public void setup() { @Test public void test1000PiecesWithAspectRatio() { - PartialJigsawInformation input = new PartialJigsawInformation(1000, null, null, null, null, 1.6, null); - PartialJigsawInformation expected = new PartialJigsawInformation(1000, 126, 874, 25, 40, 1.6, "landscape"); - - PartialJigsawInformation actual = solver.getCompleteInformation(input); + JigsawInfo input = new JigsawInfo.Builder() + .pieces(1000) + .aspectRatio(1.6) + .build(); + + JigsawInfo expected = new JigsawInfo.Builder() + .pieces(1000) + .border(126) + .inside(874) + .rows(25) + .columns(40) + .aspectRatio(1.6) + .format("landscape") + .build(); + + JigsawInfo actual = solver.getCompleteInformation(input); assertJigsawEqualsWithTolerance(actual, expected); } @Disabled("Remove to run test") @Test public void testSquarePuzzleWith32Rows() { - PartialJigsawInformation input = new PartialJigsawInformation(null, null, null, 32, null, null, "square"); - PartialJigsawInformation expected = new PartialJigsawInformation(1024, 124, 900, 32, 32, 1.0, "square"); - - PartialJigsawInformation actual = solver.getCompleteInformation(input); + JigsawInfo input = new JigsawInfo.Builder() + .rows(32) + .format("square") + .build(); + + JigsawInfo expected = new JigsawInfo.Builder() + .pieces(1024) + .border(124) + .inside(900) + .rows(32) + .columns(32) + .aspectRatio(1.0) + .format("square") + .build(); + + JigsawInfo actual = solver.getCompleteInformation(input); assertJigsawEqualsWithTolerance(actual, expected); } @Disabled("Remove to run test") @Test public void testInsideAndAspectRatioOnly() { - PartialJigsawInformation input = new PartialJigsawInformation(null, null, 324, null, null, 1.0, null); - PartialJigsawInformation expected = new PartialJigsawInformation(400, 76, 324, 20, 20, 1.0, "square"); - - PartialJigsawInformation actual = solver.getCompleteInformation(input); + JigsawInfo input = new JigsawInfo.Builder() + .inside(324) + .aspectRatio(1.0) + .build(); + + JigsawInfo expected = new JigsawInfo.Builder() + .pieces(400) + .border(76) + .inside(324) + .rows(20) + .columns(20) + .aspectRatio(1.0) + .format("square") + .build(); + + JigsawInfo actual = solver.getCompleteInformation(input); assertJigsawEqualsWithTolerance(actual, expected); } @Disabled("Remove to run test") @Test public void testLandscape1500WithRowsAndAspect() { - PartialJigsawInformation input = new PartialJigsawInformation(null, null, null, 30, null, 1.6666666666666667, null); - PartialJigsawInformation expected = new PartialJigsawInformation(1500, 156, 1344, 30, 50, 1.6666666666666667, "landscape"); - - PartialJigsawInformation actual = solver.getCompleteInformation(input); + JigsawInfo input = new JigsawInfo.Builder() + .rows(30) + .aspectRatio(1.6666666666666667) + .build(); + + JigsawInfo expected = new JigsawInfo.Builder() + .pieces(1500) + .border(156) + .inside(1344) + .rows(30) + .columns(50) + .aspectRatio(1.6666666666666667) + .format("landscape") + .build(); + + JigsawInfo actual = solver.getCompleteInformation(input); assertJigsawEqualsWithTolerance(actual, expected); } @Disabled("Remove to run test") @Test public void test300PiecesPortraitWithBorder() { - PartialJigsawInformation input = new PartialJigsawInformation(300, 70, null, null, null, null, "portrait"); - PartialJigsawInformation expected = new PartialJigsawInformation(300, 70, 230, 25, 12, 0.48, "portrait"); - - PartialJigsawInformation actual = solver.getCompleteInformation(input); + JigsawInfo input = new JigsawInfo.Builder() + .pieces(300) + .border(70) + .format("portrait") + .build(); + + JigsawInfo expected = new JigsawInfo.Builder() + .pieces(300) + .border(70) + .inside(230) + .rows(25) + .columns(12) + .aspectRatio(0.48) + .format("portrait") + .build(); + + JigsawInfo actual = solver.getCompleteInformation(input); assertJigsawEqualsWithTolerance(actual, expected); } @Disabled("Remove to run test") @Test public void testInsufficientData() { - PartialJigsawInformation input = new PartialJigsawInformation(1500, null, null, null, null, null, "landscape"); - - assertThatThrownBy(() -> solver.getCompleteInformation(input)).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("Insufficient data"); + JigsawInfo input = new JigsawInfo.Builder() + .pieces(1500) + .format("landscape") + .build(); + + assertThatThrownBy(() -> solver.getCompleteInformation(input)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("Insufficient data"); } @Disabled("Remove to run test") @Test public void testContradictoryData() { - PartialJigsawInformation input = new PartialJigsawInformation(null, null, null, 100, 1000, null, "square"); - - assertThatThrownBy(() -> solver.getCompleteInformation(input)).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("Contradictory data"); + JigsawInfo input = new JigsawInfo.Builder() + .rows(100) + .columns(1000) + .format("square") + .build(); + + assertThatThrownBy(() -> solver.getCompleteInformation(input)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("Contradictory data"); } /** - * Helper to compare two PartialJigsawInformation objects, + * Helper to compare two JigsawInfo objects, * allowing a small tolerance when comparing aspect ratio doubles. */ - private void assertJigsawEqualsWithTolerance(PartialJigsawInformation actual, PartialJigsawInformation expected) { + private void assertJigsawEqualsWithTolerance(JigsawInfo actual, JigsawInfo expected) { assertThat(actual.getPieces()).isEqualTo(expected.getPieces()); assertThat(actual.getBorder()).isEqualTo(expected.getBorder()); assertThat(actual.getInside()).isEqualTo(expected.getInside()); From eec11ac78ee4592168e41b3ea031d0306f6e9553 Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sun, 22 Jun 2025 13:18:22 -0600 Subject: [PATCH 08/11] Make getCompleteInformation static and improve naming of helper method and constant in piecing-it-together test file --- .../src/reference/java/PiecingItTogether.java | 34 ++++++++--------- .../src/main/java/PiecingItTogether.java | 2 +- .../src/test/java/PiecingItTogetherTest.java | 38 ++++++++----------- 3 files changed, 33 insertions(+), 41 deletions(-) diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java index 96cfe8183..ebf0643fa 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java @@ -1,9 +1,9 @@ import java.util.*; public class PiecingItTogether { - private final double epsilon = 1e-6; + private static final double DOUBLE_EQUALITY_TOLERANCE = 1e-9; - public JigsawInfo getCompleteInformation(JigsawInfo input) { + public static JigsawInfo getCompleteInformation(JigsawInfo input) { Integer rows = input.getRows().isPresent() ? input.getRows().getAsInt() : null; Integer cols = input.getColumns().isPresent() ? input.getColumns().getAsInt() : null; Integer pieces = input.getPieces().isPresent() ? input.getPieces().getAsInt() : null; @@ -139,10 +139,10 @@ public JigsawInfo getCompleteInformation(JigsawInfo input) { } } - private String getFormatFromAspect(double aspectRatio) { + private static String getFormatFromAspect(double aspectRatio) { String format; - if (Math.abs(aspectRatio - 1.0) < epsilon) { + if (Math.abs(aspectRatio - 1.0) < DOUBLE_EQUALITY_TOLERANCE) { format = "square"; } else if (aspectRatio < 1.0) { format = "portrait"; @@ -153,17 +153,17 @@ private String getFormatFromAspect(double aspectRatio) { return format; } - private Integer roundIfClose(double value) { + private static Integer roundIfClose(double value) { double rounded = Math.round(value); - if (Math.abs(value - rounded) < epsilon) { + if (Math.abs(value - rounded) < DOUBLE_EQUALITY_TOLERANCE) { return (int) rounded; } throw new IllegalArgumentException("Contradictory data"); } - private int calculateOtherSideFromPieces(int knownSide, int pieces) { + private static int calculateOtherSideFromPieces(int knownSide, int pieces) { if (pieces <= 0 || pieces % knownSide != 0) { throw new IllegalArgumentException("Contradictory data"); } @@ -171,7 +171,7 @@ private int calculateOtherSideFromPieces(int knownSide, int pieces) { return pieces / knownSide; } - private int calculateOtherSideFromBorder(int knownSide, int border) { + private static int calculateOtherSideFromBorder(int knownSide, int border) { if (knownSide == 1) { return border; } @@ -187,7 +187,7 @@ private int calculateOtherSideFromBorder(int knownSide, int border) { return ((border + 4) - 2 * knownSide) / 2; } - private int calculateOtherSideFromInside(int knownSide, int inside) { + private static int calculateOtherSideFromInside(int knownSide, int inside) { if (knownSide <= 2 || inside % (knownSide - 2) != 0) { throw new IllegalArgumentException("Contradictory data"); } @@ -195,7 +195,7 @@ private int calculateOtherSideFromInside(int knownSide, int inside) { return (inside / (knownSide - 2)) + 2; } - private Optional calculateOtherSide(int knownSide, boolean isRowKnown, Integer pieces, Integer border, Integer inside, Double aspect) { + private static Optional calculateOtherSide(int knownSide, boolean isRowKnown, Integer pieces, Integer border, Integer inside, Double aspect) { if (pieces != null) { return Optional.of(calculateOtherSideFromPieces(knownSide, pieces)); } else if (border != null) { @@ -217,7 +217,7 @@ private Optional calculateOtherSide(int knownSide, boolean isRowKnown, return Optional.empty(); } - private JigsawInfo fromRowsAndCols(int rows, int cols) { + private static JigsawInfo fromRowsAndCols(int rows, int cols) { int pieces = rows * cols; int border = (rows == 1 || cols == 1) ? pieces : 2 * (rows + cols - 2); int inside = pieces - border; @@ -244,7 +244,7 @@ private JigsawInfo fromRowsAndCols(int rows, int cols) { * @param input the original partial input with possibly known values * @throws IllegalArgumentException if any known value in the input conflicts with the computed result */ - public void checkConsistencyOrThrow(JigsawInfo computed, JigsawInfo input) { + private static void checkConsistencyOrThrow(JigsawInfo computed, JigsawInfo input) { if (!valuesMatch(computed.getPieces(), input.getPieces()) || !valuesMatch(computed.getBorder(), input.getBorder()) || !valuesMatch(computed.getInside(), input.getInside()) || !valuesMatch(computed.getRows(), input.getRows()) || !valuesMatch(computed.getColumns(), input.getColumns()) || !valuesMatch(computed.getAspectRatio(), input.getAspectRatio()) || !valuesMatch(computed.getFormat(), input.getFormat())) { throw new IllegalArgumentException("Contradictory data"); } @@ -260,7 +260,7 @@ public void checkConsistencyOrThrow(JigsawInfo computed, JigsawInfo input) { * @param input the original input to check for consistency * @return an Optional containing a valid inferred configuration, or empty if the guess is invalid */ - private Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed, double aspect, JigsawInfo input) { + private static Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed, double aspect, JigsawInfo input) { try { int other = isRowFixed ? roundIfClose(fixed * aspect) : roundIfClose(fixed / aspect); @@ -284,7 +284,7 @@ private Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed * @param input the original input to check for consistency * @return an Optional containing a valid configuration, or empty if inconsistent */ - private Optional tryGuess(int rows, int cols, JigsawInfo input) { + private static Optional tryGuess(int rows, int cols, JigsawInfo input) { try { JigsawInfo guess = fromRowsAndCols(rows, cols); checkConsistencyOrThrow(guess, input); @@ -304,7 +304,7 @@ private Optional tryGuess(int rows, int cols, JigsawInfo input) { * @param the type of the contained values * @return true if the values are consistent (both missing or equal if present), false otherwise */ - private boolean valuesMatch(Optional a, Optional b) { + private static boolean valuesMatch(Optional a, Optional b) { if (a.isPresent() && b.isPresent()) { return Objects.equals(a.get(), b.get()); } @@ -312,7 +312,7 @@ private boolean valuesMatch(Optional a, Optional b) { return true; } - private boolean valuesMatch(OptionalInt a, OptionalInt b) { + private static boolean valuesMatch(OptionalInt a, OptionalInt b) { if (a.isPresent() && b.isPresent()) { return a.getAsInt() == b.getAsInt(); } @@ -320,7 +320,7 @@ private boolean valuesMatch(OptionalInt a, OptionalInt b) { return true; } - private boolean valuesMatch(OptionalDouble a, OptionalDouble b) { + private static boolean valuesMatch(OptionalDouble a, OptionalDouble b) { if (a.isPresent() && b.isPresent()) { return Double.compare(a.getAsDouble(), b.getAsDouble()) == 0; } diff --git a/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java index c098f46a5..d0ba9fa81 100644 --- a/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/src/main/java/PiecingItTogether.java @@ -1,5 +1,5 @@ public class PiecingItTogether { - public JigsawInfo getCompleteInformation(JigsawInfo input) { + public static JigsawInfo getCompleteInformation(JigsawInfo input) { throw new UnsupportedOperationException("Delete this statement and write your own implementation."); } } diff --git a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java index 7aec36a08..54392ac21 100644 --- a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java +++ b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java @@ -1,4 +1,3 @@ -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -6,14 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; public class PiecingItTogetherTest { - private PiecingItTogether solver; - private double epsilon; - - @BeforeEach - public void setup() { - solver = new PiecingItTogether(); - epsilon = 1e-6; - } + private static final double DOUBLE_EQUALITY_TOLERANCE = 1e-9; @Test public void test1000PiecesWithAspectRatio() { @@ -32,8 +24,8 @@ public void test1000PiecesWithAspectRatio() { .format("landscape") .build(); - JigsawInfo actual = solver.getCompleteInformation(input); - assertJigsawEqualsWithTolerance(actual, expected); + JigsawInfo actual = PiecingItTogether.getCompleteInformation(input); + assertJigsawInfoEquals(actual, expected); } @Disabled("Remove to run test") @@ -54,8 +46,8 @@ public void testSquarePuzzleWith32Rows() { .format("square") .build(); - JigsawInfo actual = solver.getCompleteInformation(input); - assertJigsawEqualsWithTolerance(actual, expected); + JigsawInfo actual = PiecingItTogether.getCompleteInformation(input); + assertJigsawInfoEquals(actual, expected); } @Disabled("Remove to run test") @@ -76,8 +68,8 @@ public void testInsideAndAspectRatioOnly() { .format("square") .build(); - JigsawInfo actual = solver.getCompleteInformation(input); - assertJigsawEqualsWithTolerance(actual, expected); + JigsawInfo actual = PiecingItTogether.getCompleteInformation(input); + assertJigsawInfoEquals(actual, expected); } @Disabled("Remove to run test") @@ -98,8 +90,8 @@ public void testLandscape1500WithRowsAndAspect() { .format("landscape") .build(); - JigsawInfo actual = solver.getCompleteInformation(input); - assertJigsawEqualsWithTolerance(actual, expected); + JigsawInfo actual = PiecingItTogether.getCompleteInformation(input); + assertJigsawInfoEquals(actual, expected); } @Disabled("Remove to run test") @@ -121,8 +113,8 @@ public void test300PiecesPortraitWithBorder() { .format("portrait") .build(); - JigsawInfo actual = solver.getCompleteInformation(input); - assertJigsawEqualsWithTolerance(actual, expected); + JigsawInfo actual = PiecingItTogether.getCompleteInformation(input); + assertJigsawInfoEquals(actual, expected); } @Disabled("Remove to run test") @@ -133,7 +125,7 @@ public void testInsufficientData() { .format("landscape") .build(); - assertThatThrownBy(() -> solver.getCompleteInformation(input)) + assertThatThrownBy(() -> PiecingItTogether.getCompleteInformation(input)) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("Insufficient data"); } @@ -147,7 +139,7 @@ public void testContradictoryData() { .format("square") .build(); - assertThatThrownBy(() -> solver.getCompleteInformation(input)) + assertThatThrownBy(() -> PiecingItTogether.getCompleteInformation(input)) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("Contradictory data"); } @@ -156,7 +148,7 @@ public void testContradictoryData() { * Helper to compare two JigsawInfo objects, * allowing a small tolerance when comparing aspect ratio doubles. */ - private void assertJigsawEqualsWithTolerance(JigsawInfo actual, JigsawInfo expected) { + private void assertJigsawInfoEquals(JigsawInfo actual, JigsawInfo expected) { assertThat(actual.getPieces()).isEqualTo(expected.getPieces()); assertThat(actual.getBorder()).isEqualTo(expected.getBorder()); assertThat(actual.getInside()).isEqualTo(expected.getInside()); @@ -167,6 +159,6 @@ private void assertJigsawEqualsWithTolerance(JigsawInfo actual, JigsawInfo expec Double actualAspect = actual.getAspectRatio().orElseThrow(() -> new AssertionError("Missing aspect ratio in actual result")); Double expectedAspect = expected.getAspectRatio().orElseThrow(() -> new AssertionError("Missing aspect ratio in expected result")); - assertThat(actualAspect).isCloseTo(expectedAspect, org.assertj.core.api.Assertions.within(epsilon)); + assertThat(actualAspect).isCloseTo(expectedAspect, org.assertj.core.api.Assertions.within(DOUBLE_EQUALITY_TOLERANCE)); } } From 965396cddbe58ddc5e83d1f8b1930c5cc0669e77 Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Sun, 22 Jun 2025 13:58:05 -0600 Subject: [PATCH 09/11] Simplify reference solution for piecing-it-together practice exercise --- .../src/reference/java/PiecingItTogether.java | 297 +++--------------- 1 file changed, 51 insertions(+), 246 deletions(-) diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java index ebf0643fa..48f4237f6 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java @@ -2,130 +2,40 @@ public class PiecingItTogether { private static final double DOUBLE_EQUALITY_TOLERANCE = 1e-9; + private static final int MAX_DIMENSION = 1000; public static JigsawInfo getCompleteInformation(JigsawInfo input) { - Integer rows = input.getRows().isPresent() ? input.getRows().getAsInt() : null; - Integer cols = input.getColumns().isPresent() ? input.getColumns().getAsInt() : null; - Integer pieces = input.getPieces().isPresent() ? input.getPieces().getAsInt() : null; - Integer border = input.getBorder().isPresent() ? input.getBorder().getAsInt() : null; - Integer inside = input.getInside().isPresent() ? input.getInside().getAsInt() : null; - Double aspect = input.getAspectRatio().isPresent() ? input.getAspectRatio().getAsDouble() : null; - String format = input.getFormat().orElse(null); - - // Final information to be compared with the original input to detect inconsistencies - JigsawInfo result = null; - - // Check format and aspect ratio don't contradict each other or set aspect if format is square - if (format != null && aspect != null) { - if (!format.equals(getFormatFromAspect(aspect))) { - throw new IllegalArgumentException("Contradictory data"); - } - } else if ("square".equalsIgnoreCase(format)) { - aspect = 1.0; - } - - // Derive any missing value among pieces, border, and inside - if (pieces != null && border != null && inside != null) { - if (pieces != border + inside) { - throw new IllegalArgumentException("Contradictory data"); - } - } else if (pieces != null && border != null) { - inside = pieces - border; - } else if (border != null && inside != null) { - pieces = border + inside; - } else if (inside != null && pieces != null) { - border = pieces - inside; - } - - // Try to compute missing information using the numbers of rows and cols - if (rows != null && cols != null) { - result = fromRowsAndCols(rows, cols); - } else if (rows != null) { - Optional possibleCols = calculateOtherSide(rows, true, pieces, border, inside, aspect); - - if (possibleCols.isPresent()) { - cols = possibleCols.get(); - result = fromRowsAndCols(rows, cols); - } - } else if (cols != null) { - Optional possibleRows = calculateOtherSide(cols, false, pieces, border, inside, aspect); - - if (possibleRows.isPresent()) { - rows = possibleRows.get(); - result = fromRowsAndCols(rows, cols); - } - } - - if (result != null) { - checkConsistencyOrThrow(result, input); - return result; - } - - // Try to compute missing information using the value of aspect ratio - if (aspect != null) { - if (pieces != null) { - double actualRows = Math.sqrt(pieces / aspect); - rows = roundIfClose(actualRows); - - double actualCols = aspect * rows; - cols = roundIfClose(actualCols); - - result = fromRowsAndCols(rows, cols); - checkConsistencyOrThrow(result, input); - return result; - } else if (inside != null && inside == 0) { - List validGuesses = new ArrayList<>(); - - for (int fixed : List.of(1, 2)) { - tryGuessWithFixedSide(fixed, true, aspect, input).ifPresent(validGuesses::add); // rows = fixed - tryGuessWithFixedSide(fixed, false, aspect, input).ifPresent(validGuesses::add); // cols = fixed - } - - if (validGuesses.size() == 1) { - return validGuesses.getFirst(); - } else if (validGuesses.size() > 1) { - throw new IllegalArgumentException("Insufficient data"); - } else { - throw new IllegalArgumentException("Contradictory data"); - } - } - } - - if (pieces == null && border == null && (inside == null || inside == 0)) { - throw new IllegalArgumentException("Insufficient data"); - } - - // Brute force as a last resort List validGuesses = new ArrayList<>(); - // Brute-force using pieces - if (pieces != null) { - for (int r = 1; r <= pieces; r++) { - if (pieces % r != 0) { - continue; // cols must be integer + if (input.getPieces().isPresent()) { + // If pieces is known, we only test divisors of pieces + int pieces = input.getPieces().getAsInt(); + for (int rows = 1; rows <= pieces; rows++) { + if (pieces % rows != 0) { + continue; } - - int c = pieces / r; - tryGuess(r, c, input).ifPresent(validGuesses::add); + int columns = pieces / rows; + createValidJigsaw(rows, columns, input).ifPresent(validGuesses::add); } - } else if (inside != null) { - for (int r = 3; r <= inside + 2; r++) { - int innerRows = r - 2; + } else if (input.getInside().isPresent() && input.getInside().getAsInt() > 0) { + // If inside pieces is non-zero, we only test divisors of inside + int inside = input.getInside().getAsInt(); + for (int innerRows = 1; innerRows <= inside; innerRows++) { if (inside % innerRows != 0) { continue; } - - int innerCols = inside / innerRows; - int c = innerCols + 2; - - tryGuess(r, c, input).ifPresent(validGuesses::add); + int innerColumns = inside / innerRows; + createValidJigsaw(innerRows + 2, innerColumns + 2, input).ifPresent(validGuesses::add); } } else { - int max = Math.min(border, 1000); - - for (int r = 1; r <= max; r++) { - for (int c = 1; c <= max; c++) { - tryGuess(r, c, input).ifPresent(validGuesses::add); + // Brute force using border constraint if available + int maxDimension = input.getBorder().isPresent() + ? Math.min(input.getBorder().getAsInt(), MAX_DIMENSION) + : MAX_DIMENSION; + + for (int rows = 1; rows <= maxDimension; rows++) { + for (int columns = 1; columns <= maxDimension; columns++) { + createValidJigsaw(rows, columns, input).ifPresent(validGuesses::add); } } } @@ -140,170 +50,65 @@ public static JigsawInfo getCompleteInformation(JigsawInfo input) { } private static String getFormatFromAspect(double aspectRatio) { - String format; - if (Math.abs(aspectRatio - 1.0) < DOUBLE_EQUALITY_TOLERANCE) { - format = "square"; + return "square"; } else if (aspectRatio < 1.0) { - format = "portrait"; + return "portrait"; } else { - format = "landscape"; - } - - return format; - } - - private static Integer roundIfClose(double value) { - double rounded = Math.round(value); - - if (Math.abs(value - rounded) < DOUBLE_EQUALITY_TOLERANCE) { - return (int) rounded; + return "landscape"; } - - throw new IllegalArgumentException("Contradictory data"); } - private static int calculateOtherSideFromPieces(int knownSide, int pieces) { - if (pieces <= 0 || pieces % knownSide != 0) { - throw new IllegalArgumentException("Contradictory data"); - } - - return pieces / knownSide; - } - - private static int calculateOtherSideFromBorder(int knownSide, int border) { - if (knownSide == 1) { - return border; - } - - if (knownSide == border) { - return 1; - } - - if ((border + 4 <= 2 * knownSide) || border % 2 != 0) { - throw new IllegalArgumentException("Contradictory data"); - } - - return ((border + 4) - 2 * knownSide) / 2; - } - - private static int calculateOtherSideFromInside(int knownSide, int inside) { - if (knownSide <= 2 || inside % (knownSide - 2) != 0) { - throw new IllegalArgumentException("Contradictory data"); - } - - return (inside / (knownSide - 2)) + 2; - } - - private static Optional calculateOtherSide(int knownSide, boolean isRowKnown, Integer pieces, Integer border, Integer inside, Double aspect) { - if (pieces != null) { - return Optional.of(calculateOtherSideFromPieces(knownSide, pieces)); - } else if (border != null) { - return Optional.of(calculateOtherSideFromBorder(knownSide, border)); - } else if (aspect != null) { - double raw = isRowKnown ? knownSide * aspect : knownSide / aspect; - return Optional.of(roundIfClose(raw)); - } else if (inside != null) { - if (inside == 0) { - // When inside is zero and all other values (otherSide, pieces, border, aspect) are unknown, - // it only tells us that either rows or cols is 1 or 2, but provides no way to infer the rest. - // Since we can't make any further assumptions, we stop here. - throw new IllegalArgumentException("Insufficient data"); - } - - return Optional.of(calculateOtherSideFromInside(knownSide, inside)); - } - - return Optional.empty(); - } - - private static JigsawInfo fromRowsAndCols(int rows, int cols) { - int pieces = rows * cols; - int border = (rows == 1 || cols == 1) ? pieces : 2 * (rows + cols - 2); + private static JigsawInfo fromRowsAndCols(int rows, int columns) { + int pieces = rows * columns; + int border = (rows == 1 || columns == 1) ? pieces : 2 * (rows + columns - 2); int inside = pieces - border; - double aspect = (double) cols / rows; - String format = getFormatFromAspect(aspect); + double aspectRatio = (double) columns / rows; + String format = getFormatFromAspect(aspectRatio); return new JigsawInfo.Builder() .pieces(pieces) .border(border) .inside(inside) .rows(rows) - .columns(cols) - .aspectRatio(aspect) + .columns(columns) + .aspectRatio(aspectRatio) .format(format) .build(); } /** * Verifies that all known values in the input match those in the computed result. - * If any known value in the input contradicts the corresponding computed value, - * an IllegalArgumentException is thrown. + * Returns false if any known value conflicts, true if all values are consistent. * * @param computed the fully inferred jigsaw information - * @param input the original partial input with possibly known values - * @throws IllegalArgumentException if any known value in the input conflicts with the computed result + * @param input the original partial input with possibly empty values + * @return true if all values are consistent, false if any conflict exists */ - private static void checkConsistencyOrThrow(JigsawInfo computed, JigsawInfo input) { - if (!valuesMatch(computed.getPieces(), input.getPieces()) || !valuesMatch(computed.getBorder(), input.getBorder()) || !valuesMatch(computed.getInside(), input.getInside()) || !valuesMatch(computed.getRows(), input.getRows()) || !valuesMatch(computed.getColumns(), input.getColumns()) || !valuesMatch(computed.getAspectRatio(), input.getAspectRatio()) || !valuesMatch(computed.getFormat(), input.getFormat())) { - throw new IllegalArgumentException("Contradictory data"); - } + private static boolean isConsistent(JigsawInfo computed, JigsawInfo input) { + return valuesMatch(computed.getPieces(), input.getPieces()) && + valuesMatch(computed.getBorder(), input.getBorder()) && + valuesMatch(computed.getInside(), input.getInside()) && + valuesMatch(computed.getRows(), input.getRows()) && + valuesMatch(computed.getColumns(), input.getColumns()) && + valuesMatch(computed.getAspectRatio(), input.getAspectRatio()) && + valuesMatch(computed.getFormat(), input.getFormat()); } /** - * Attempts to compute a valid jigsaw configuration by fixing one dimension - * (either rows or columns) and inferring the other using the aspect ratio. - * - * @param fixed the known size of one side (either rows or columns) - * @param isRowFixed true if the fixed value represents rows, false if columns - * @param aspect the desired aspect ratio (cols / rows) - * @param input the original input to check for consistency - * @return an Optional containing a valid inferred configuration, or empty if the guess is invalid - */ - private static Optional tryGuessWithFixedSide(int fixed, boolean isRowFixed, double aspect, JigsawInfo input) { - try { - int other = isRowFixed ? roundIfClose(fixed * aspect) : roundIfClose(fixed / aspect); - - int rows = isRowFixed ? fixed : other; - int cols = isRowFixed ? other : fixed; - - JigsawInfo guess = fromRowsAndCols(rows, cols); - checkConsistencyOrThrow(guess, input); - return Optional.of(guess); - } catch (IllegalArgumentException ignored) { - return Optional.empty(); - } - } - - /** - * Attempts to construct a jigsaw configuration using the specified number of rows and columns. + * Attempts to construct a valid jigsaw configuration using the specified number of rows and columns. * Returns a valid result only if the configuration is consistent with the input. * - * @param rows number of rows to try - * @param cols number of columns to try - * @param input the original input to check for consistency + * @param rows number of rows to try + * @param columns number of columns to try + * @param input the original input to check for consistency * @return an Optional containing a valid configuration, or empty if inconsistent */ - private static Optional tryGuess(int rows, int cols, JigsawInfo input) { - try { - JigsawInfo guess = fromRowsAndCols(rows, cols); - checkConsistencyOrThrow(guess, input); - return Optional.of(guess); - } catch (IllegalArgumentException ignored) { - return Optional.empty(); - } + private static Optional createValidJigsaw(int rows, int columns, JigsawInfo input) { + JigsawInfo candidate = fromRowsAndCols(rows, columns); + return isConsistent(candidate, input) ? Optional.of(candidate) : Optional.empty(); } - /** - * Compares two optional values for equality. - * Returns true if either value is absent, or if both are present and equal. - * Used to check consistency between inferred and input data. - * - * @param a the first optional value - * @param b the second optional value - * @param the type of the contained values - * @return true if the values are consistent (both missing or equal if present), false otherwise - */ private static boolean valuesMatch(Optional a, Optional b) { if (a.isPresent() && b.isPresent()) { return Objects.equals(a.get(), b.get()); From 7d3aaa7d1b5a7099dc76805c0223f29b2b21ce9d Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Mon, 23 Jun 2025 12:48:00 -0600 Subject: [PATCH 10/11] Refactor JigsawInfo builder to use Optionals and fix piecing-it-together style issues --- .../piecing-it-together/.meta/config.json | 2 +- .../.meta/src/reference/java/JigsawInfo.java | 69 +++++++++++-------- .../src/reference/java/PiecingItTogether.java | 2 +- .../src/main/java/JigsawInfo.java | 69 +++++++++++-------- .../src/test/java/PiecingItTogetherTest.java | 9 ++- 5 files changed, 86 insertions(+), 65 deletions(-) diff --git a/exercises/practice/piecing-it-together/.meta/config.json b/exercises/practice/piecing-it-together/.meta/config.json index d507bf844..76e6e6cbf 100644 --- a/exercises/practice/piecing-it-together/.meta/config.json +++ b/exercises/practice/piecing-it-together/.meta/config.json @@ -13,7 +13,7 @@ ".meta/src/reference/java/PiecingItTogether.java" ], "editor": [ - ".meta/src/reference/java/JigsawInfo.java" + "src/main/java/JigsawInfo.java" ] }, "blurb": "Fill in missing jigsaw puzzle details from partial data", diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java index 094889571..e08eb8909 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/JigsawInfo.java @@ -18,56 +18,56 @@ public class JigsawInfo { private final Optional format; private JigsawInfo(Builder builder) { - this.pieces = builder.pieces != null ? OptionalInt.of(builder.pieces) : OptionalInt.empty(); - this.border = builder.border != null ? OptionalInt.of(builder.border) : OptionalInt.empty(); - this.inside = builder.inside != null ? OptionalInt.of(builder.inside) : OptionalInt.empty(); - this.rows = builder.rows != null ? OptionalInt.of(builder.rows) : OptionalInt.empty(); - this.columns = builder.columns != null ? OptionalInt.of(builder.columns) : OptionalInt.empty(); - this.aspectRatio = builder.aspectRatio != null ? OptionalDouble.of(builder.aspectRatio) : OptionalDouble.empty(); - this.format = Optional.ofNullable(builder.format); + this.pieces = builder.pieces; + this.border = builder.border; + this.inside = builder.inside; + this.rows = builder.rows; + this.columns = builder.columns; + this.aspectRatio = builder.aspectRatio; + this.format = builder.format; } public static class Builder { - private Integer pieces; - private Integer border; - private Integer inside; - private Integer rows; - private Integer columns; - private Double aspectRatio; - private String format; - - public Builder pieces(Integer pieces) { - this.pieces = pieces; + private OptionalInt pieces = OptionalInt.empty(); + private OptionalInt border = OptionalInt.empty(); + private OptionalInt inside = OptionalInt.empty(); + private OptionalInt rows = OptionalInt.empty(); + private OptionalInt columns = OptionalInt.empty(); + private OptionalDouble aspectRatio = OptionalDouble.empty(); + private Optional format = Optional.empty(); + + public Builder pieces(int pieces) { + this.pieces = OptionalInt.of(pieces); return this; } - public Builder border(Integer border) { - this.border = border; + public Builder border(int border) { + this.border = OptionalInt.of(border); return this; } - public Builder inside(Integer inside) { - this.inside = inside; + public Builder inside(int inside) { + this.inside = OptionalInt.of(inside); return this; } - public Builder rows(Integer rows) { - this.rows = rows; + public Builder rows(int rows) { + this.rows = OptionalInt.of(rows); return this; } - public Builder columns(Integer columns) { - this.columns = columns; + public Builder columns(int columns) { + this.columns = OptionalInt.of(columns); return this; } - public Builder aspectRatio(Double aspectRatio) { - this.aspectRatio = aspectRatio; + public Builder aspectRatio(double aspectRatio) { + this.aspectRatio = OptionalDouble.of(aspectRatio); return this; } public Builder format(String format) { - this.format = format; + this.format = Optional.of(format); return this; } @@ -106,9 +106,18 @@ public Optional getFormat() { @Override public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; + if (o == null || getClass() != o.getClass()) { + return false; + } + JigsawInfo that = (JigsawInfo) o; - return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); + return Objects.equals(pieces, that.pieces) + && Objects.equals(border, that.border) + && Objects.equals(inside, that.inside) + && Objects.equals(rows, that.rows) + && Objects.equals(columns, that.columns) + && Objects.equals(aspectRatio, that.aspectRatio) + && Objects.equals(format, that.format); } @Override diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java index 48f4237f6..dd0fbbbc7 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java @@ -132,4 +132,4 @@ private static boolean valuesMatch(OptionalDouble a, OptionalDouble b) { return true; } -} \ No newline at end of file +} diff --git a/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java b/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java index 094889571..e08eb8909 100644 --- a/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java +++ b/exercises/practice/piecing-it-together/src/main/java/JigsawInfo.java @@ -18,56 +18,56 @@ public class JigsawInfo { private final Optional format; private JigsawInfo(Builder builder) { - this.pieces = builder.pieces != null ? OptionalInt.of(builder.pieces) : OptionalInt.empty(); - this.border = builder.border != null ? OptionalInt.of(builder.border) : OptionalInt.empty(); - this.inside = builder.inside != null ? OptionalInt.of(builder.inside) : OptionalInt.empty(); - this.rows = builder.rows != null ? OptionalInt.of(builder.rows) : OptionalInt.empty(); - this.columns = builder.columns != null ? OptionalInt.of(builder.columns) : OptionalInt.empty(); - this.aspectRatio = builder.aspectRatio != null ? OptionalDouble.of(builder.aspectRatio) : OptionalDouble.empty(); - this.format = Optional.ofNullable(builder.format); + this.pieces = builder.pieces; + this.border = builder.border; + this.inside = builder.inside; + this.rows = builder.rows; + this.columns = builder.columns; + this.aspectRatio = builder.aspectRatio; + this.format = builder.format; } public static class Builder { - private Integer pieces; - private Integer border; - private Integer inside; - private Integer rows; - private Integer columns; - private Double aspectRatio; - private String format; - - public Builder pieces(Integer pieces) { - this.pieces = pieces; + private OptionalInt pieces = OptionalInt.empty(); + private OptionalInt border = OptionalInt.empty(); + private OptionalInt inside = OptionalInt.empty(); + private OptionalInt rows = OptionalInt.empty(); + private OptionalInt columns = OptionalInt.empty(); + private OptionalDouble aspectRatio = OptionalDouble.empty(); + private Optional format = Optional.empty(); + + public Builder pieces(int pieces) { + this.pieces = OptionalInt.of(pieces); return this; } - public Builder border(Integer border) { - this.border = border; + public Builder border(int border) { + this.border = OptionalInt.of(border); return this; } - public Builder inside(Integer inside) { - this.inside = inside; + public Builder inside(int inside) { + this.inside = OptionalInt.of(inside); return this; } - public Builder rows(Integer rows) { - this.rows = rows; + public Builder rows(int rows) { + this.rows = OptionalInt.of(rows); return this; } - public Builder columns(Integer columns) { - this.columns = columns; + public Builder columns(int columns) { + this.columns = OptionalInt.of(columns); return this; } - public Builder aspectRatio(Double aspectRatio) { - this.aspectRatio = aspectRatio; + public Builder aspectRatio(double aspectRatio) { + this.aspectRatio = OptionalDouble.of(aspectRatio); return this; } public Builder format(String format) { - this.format = format; + this.format = Optional.of(format); return this; } @@ -106,9 +106,18 @@ public Optional getFormat() { @Override public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; + if (o == null || getClass() != o.getClass()) { + return false; + } + JigsawInfo that = (JigsawInfo) o; - return Objects.equals(pieces, that.pieces) && Objects.equals(border, that.border) && Objects.equals(inside, that.inside) && Objects.equals(rows, that.rows) && Objects.equals(columns, that.columns) && Objects.equals(aspectRatio, that.aspectRatio) && Objects.equals(format, that.format); + return Objects.equals(pieces, that.pieces) + && Objects.equals(border, that.border) + && Objects.equals(inside, that.inside) + && Objects.equals(rows, that.rows) + && Objects.equals(columns, that.columns) + && Objects.equals(aspectRatio, that.aspectRatio) + && Objects.equals(format, that.format); } @Override diff --git a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java index 54392ac21..b07648c0a 100644 --- a/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java +++ b/exercises/practice/piecing-it-together/src/test/java/PiecingItTogetherTest.java @@ -156,9 +156,12 @@ private void assertJigsawInfoEquals(JigsawInfo actual, JigsawInfo expected) { assertThat(actual.getColumns()).isEqualTo(expected.getColumns()); assertThat(actual.getFormat()).isEqualTo(expected.getFormat()); - Double actualAspect = actual.getAspectRatio().orElseThrow(() -> new AssertionError("Missing aspect ratio in actual result")); - Double expectedAspect = expected.getAspectRatio().orElseThrow(() -> new AssertionError("Missing aspect ratio in expected result")); + Double actualAspect = actual.getAspectRatio() + .orElseThrow(() -> new AssertionError("Missing aspect ratio in actual result")); + Double expectedAspect = expected.getAspectRatio() + .orElseThrow(() -> new AssertionError("Missing aspect ratio in expected result")); - assertThat(actualAspect).isCloseTo(expectedAspect, org.assertj.core.api.Assertions.within(DOUBLE_EQUALITY_TOLERANCE)); + assertThat(actualAspect).isCloseTo(expectedAspect, + org.assertj.core.api.Assertions.within(DOUBLE_EQUALITY_TOLERANCE)); } } From bdd7ba9d36986ffc65e377afe05c488d31e0461e Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Wed, 25 Jun 2025 13:57:34 -0600 Subject: [PATCH 11/11] Replace getFirst() with get(0) to fix incompatibility with JDK 17 in piecing-it-together --- .../.meta/src/reference/java/PiecingItTogether.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java index dd0fbbbc7..ddbb91dc8 100644 --- a/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java +++ b/exercises/practice/piecing-it-together/.meta/src/reference/java/PiecingItTogether.java @@ -41,7 +41,7 @@ public static JigsawInfo getCompleteInformation(JigsawInfo input) { } if (validGuesses.size() == 1) { - return validGuesses.getFirst(); + return validGuesses.get(0); } else if (validGuesses.size() > 1) { throw new IllegalArgumentException("Insufficient data"); } else {