Kropki helper constraint

SudokuSolver/Constraints/AnykropkiConstraint.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using static SudokuSolver.SolverUtility;
+using System.IO;
+
+namespace SudokuSolver.Constraints
+{
+    [Constraint(DisplayName = "Anykropki", ConsoleName = "anykropki")]
+    public class AnykropkiConstraint : OrthogonalValueConstraint
+    {
+        public AnykropkiConstraint(Solver sudokuSolver, string options) : base(sudokuSolver, options)
+        {
+        }
+
+        protected override bool IsPairAllowedAcrossMarker(int markerValue, int v0, int v1)
+        {
+            switch (markerValue)
+            {
+                case 1:
+                    return v0 + 1 == v1 || v1 + 1 == v0 || v0 * 2 == v1 || v1 * 2 == v0;
+                case 2:
+                    return v0 * 2 != v1 && v1 * 2 != v0;
+                case 3:
+                    return v0 + 1 != v1 && v1 + 1 != v0;
+            }
+            return true;
+        }
+
+        protected override IEnumerable<OrthogonalValueConstraint> GetRelatedConstraints(Solver solver) =>
+            ((IEnumerable<OrthogonalValueConstraint>)solver.Constraints<DifferenceConstraint>()).Concat(solver.Constraints<RatioConstraint>());
+
+        protected override int DefaultMarkerValue => 0;
+    }
+}

SudokuSolver/Constraints/DifferenceConstraint.cs

@@ -16,7 +16,7 @@ public DifferenceConstraint(Solver sudokuSolver, string options) : base(sudokuSo
         protected override bool IsPairAllowedAcrossMarker(int markerValue, int v0, int v1) => (v0 + markerValue == v1 || v1 + markerValue == v0);
 
         protected override IEnumerable<OrthogonalValueConstraint> GetRelatedConstraints(Solver solver) =>
-            solver.Constraints<RatioConstraint>();
+            ((IEnumerable<OrthogonalValueConstraint>)solver.Constraints<RatioConstraint>()).Concat(solver.Constraints<AnykropkiConstraint>());
 
         protected override int DefaultMarkerValue => 1;
     }

SudokuSolver/Constraints/OrthogonalValueConstraint.cs

@@ -41,9 +41,9 @@ public abstract class OrthogonalValueConstraint : Constraint
 
 
         private static readonly Regex negRegex = new(@"neg(\d*)");
-        private static readonly Regex twoCellsRegex = new(@"(\d*)r(\d+)c(\d+)r(\d+)c(\d+)");
-        private static readonly Regex sharedRowRegex = new(@"(\d*)r(\d+)[,-](\d+)c(\d+)");
-        private static readonly Regex sharedColRegex = new(@"(\d*)r(\d+)c(\d+)[,-](\d+)");
+        private static readonly Regex twoCellsRegex = new(@"(-?\d*)r(\d+)c(\d+)r(\d+)c(\d+)");
+        private static readonly Regex sharedRowRegex = new(@"(-?\d*)r(\d+)[,-](\d+)c(\d+)");
+        private static readonly Regex sharedColRegex = new(@"(-?\d*)r(\d+)c(\d+)[,-](\d+)");
 
         public OrthogonalValueConstraint(Solver sudokuSolver, string options) : base(sudokuSolver)
         {

SudokuSolver/Constraints/RatioConstraint.cs

@@ -16,7 +16,7 @@ public RatioConstraint(Solver sudokuSolver, string options) : base(sudokuSolver,
         protected override bool IsPairAllowedAcrossMarker(int markerValue, int v0, int v1) => (v0 * markerValue == v1 || v1 * markerValue == v0);
 
         protected override IEnumerable<OrthogonalValueConstraint> GetRelatedConstraints(Solver solver) =>
-            solver.Constraints<DifferenceConstraint>();
+            ((IEnumerable<OrthogonalValueConstraint>)solver.Constraints<DifferenceConstraint>()).Concat(solver.Constraints<AnykropkiConstraint>());
 
         protected override int DefaultMarkerValue => 2;
     }

SudokuSolver/PuzzleFormats/FPuzzlesBoard.cs

@@ -51,6 +51,7 @@ public record FPuzzlesBoard(
         FPuzzlesCells[] difference,
         FPuzzlesCells[] xv,
         FPuzzlesCells[] ratio,
+        FPuzzlesCells[] anykropki,
         FPuzzlesClone[] clone,
         FPuzzlesQuadruple[] quadruple,
         FPuzzlesLines[] betweenline,

SudokuSolver/SolverFactory.cs

@@ -652,6 +652,29 @@ public static Solver CreateFromFPuzzles(string fpuzzlesURL, IEnumerable<string>
                 }
             }
 
+            if (fpuzzlesData.anykropki != null && fpuzzlesData.anykropki.Length > 0)
+            {
+                StringBuilder anykropkiParams = new();
+
+                foreach (var anykropki in fpuzzlesData.anykropki)
+                {
+                    if (anykropkiParams.Length > 0)
+                    {
+                        anykropkiParams.Append(';');
+                    }
+                    anykropkiParams.Append(anykropki.value);
+                    foreach (var cell in anykropki.cells)
+                    {
+                        anykropkiParams.Append(cell);
+                    }
+                }
+
+                if (anykropkiParams.Length > 0)
+                {
+                    solver.AddConstraint(typeof(AnykropkiConstraint), anykropkiParams.ToString());
+                }
+            }
+
             bool negativeXV = fpuzzlesData.negative?.Contains("xv") ?? false;
             if (fpuzzlesData.xv != null && fpuzzlesData.xv.Length > 0 || negativeXV)
             {
@@ -1062,6 +1085,15 @@ public static string ToFPuzzlesURL(Solver solver, bool justBase64 = false)
                 ratio.Add(new(new string[] { CN(cell1), CN(cell2) }, value));
             }
 
+            List<FPuzzlesCells> anykropki = new();
+            foreach (var marker in solver.Constraints<AnykropkiConstraint>().SelectMany(c => c.markers))
+            {
+                var cell1 = (marker.Key.Item1, marker.Key.Item2);
+                var cell2 = (marker.Key.Item3, marker.Key.Item4);
+                string value = marker.Value != 2 ? marker.Value.ToString() : null;
+                anykropki.Add(new(new string[] { CN(cell1), CN(cell2) }, value));
+            }
+
             List<FPuzzlesClone> clone = new();
             foreach (var c in solver.Constraints<CloneConstraint>())
             {
@@ -1135,6 +1167,7 @@ public static string ToFPuzzlesURL(Solver solver, bool justBase64 = false)
                 difference: difference.ToArray(),
                 xv: xv.ToArray(),
                 ratio: ratio.ToArray(),
+                anykropki: anykropki.ToArray(),
                 clone: clone.ToArray(),
                 quadruple: quadruple.ToArray(),
                 betweenline: betweenline.ToArray(),