address pr comments

Author: atk

exercises/jigsaw-puzzle/canonical-data.json

@@ -43,9 +43,14 @@
     },
     {
       "uuid": "25e21469-1388-11f0-881d-145afc5ea279",
-      "description": "300 pieces puzzle with 70 border pieces",
+      "description": "300 pieces portrait puzzle with 70 border pieces",
       "property": "jigsawData",
       "input": {
+        "pieces": 300,
+        "border": 70,
+        "format": "portrait"
+      },
+      "expected": {
         "pieces": 300,
         "border": 70,
         "inside": 230,
@@ -57,7 +62,7 @@
     },
     {
       "uuid": "2d910864-1388-11f0-9a22-145afc5ea279",
-      "description": "3d ball puzzle with 81 pieces",
+      "description": "puzzle globe with 81 pieces",
       "property": "jigsawData",
       "input": {
         "border": 0,
@@ -70,7 +75,7 @@
         "rows": 9,
         "columns": 9,
         "aspectRatio": 1.0,
-        "format": "3d ball"
+        "format": "globe"
       }
     },
     {
@@ -85,9 +90,19 @@
         "error": "Insufficient data"
       }
     },
+    {
+      "uuid": "744de990-13bb-11f0-8731-145afc5ea279",
+      "description": "pizzle with contradictory data",
+      "property": "jigsawData",
+      "input": {
+        "rows": "100",
+        "columns": "1000",
+        "format": "square"
+      }
+    },
     {
       "uuid": "42b3f426-1388-11f0-ab04-145afc5ea279",
-      "description": "500 pieces configurations",
+      "description": "100 pieces configurations",
       "property": "jigsawConfigurations",
       "input": 100,
       "expected": [

exercises/jigsaw-puzzle/instructions.md

@@ -1,21 +1,15 @@
-### Task 1
-
-Provide a function `jigsawData` that receives a part of the information and fills in the blanks. If the provided information is insufficient to calculate the rest, there should be an error "Insufficient information". The full information about the jigsaw puzzle contains
+You get part of the information and need to fills in the blanks. If the provided information is insufficient to calculate the rest, there should be an error "Insufficient information". If the data given is contradictory, there should be an error "Contradictory information" The full information about the jigsaw puzzle contains the following parts:
 
 - `pieces`: Number of pieces
 - `border`: Number of border pieces
 - `inside`: Number of inside pieces
 - `rows`: Number of rows of pieces
 - `columns`: Number of columns of pieces
-- `aspecRatio`: Aspect ratio of columns / rows
-- `format`: Format of the puzzle: `"portrait" / "square" / "landscape" / "3d ball"`
-
-For the rows and columns of a 3d ball puzzle, assume a square distribution.
-
-### Task 2
+- `aspectRatio`: Aspect ratio of columns / rows
+- `format`: Format of the puzzle: `"portrait" / "square" / "landscape" / "globe"`
 
-Spoilt by the comfort of your helper, your friend now no longer wants to count border pieces, so they want another function that gives them a list of the possible even rows/columns configuration for a number of pieces, so they can estimate from the picture in the future.
+For the rows and columns of a puzzle globe, assume an aspect ratio of 1.0, so rows and columns are identical.
 
-Write a `jigsawConfigurations` function that takes the number of pieces and returns an array of the possible numbers of rows and columns.
+Spoilt by the comfort of your helper, your friend now no longer wants to count border pieces. To help with estimating, you take the number of pieces and return an array of the possible numbers of rows and columns.
 
 Start with the lowest number of rows and work your way up from there. While a single-row jigsaw puzzle might be a strange novelty, it is theoretically possible, so you should include this case.