Fix regression in how we handle solution copying

src/Conjure/UI/MainHelper.hs

@@ -376,15 +376,21 @@ mainWithArgs config@Solve{..} = do
                             case stripPostfix ext (snd (splitFileName file)) of
                                 Nothing -> return ()
                                 Just base -> do
-                                    let parts = splitOn "-" base
+                                    let parts' = splitOn "-" base
+                                    let parts = case (head parts', parts', last parts') of
+                                                    (model, _:paramparts, stripPrefix "solution" -> msolnum) ->
+                                                        case msolnum of
+                                                            Nothing -> [model, intercalate "-" paramparts]
+                                                            Just{}  -> [model, intercalate "-" (init paramparts), last paramparts]
+                                                    _ -> parts'
                                     case (solutionsInOneFile, null essenceParams, nbSolutions == "1", parts) of
                                         -- not parameterised, but no solution numbers. must be using solutionsInOneFile.
-                                        (True, True, _singleSolution, [_model]) ->
+                                        (True, True, _singleSolution, [_model, ""]) ->
                                             copySolution file $ essenceDir
                                                                 </> essenceBasename
                                                                 <.> ext
                                         -- not parameterised, with solution numbers
-                                        (False, True, singleSolution, [_model, (stripPrefix "solution" -> Just solnum)]) ->
+                                        (False, True, singleSolution, [_model, "", (stripPrefix "solution" -> Just solnum)]) ->
                                             if singleSolution
                                                 then when (solnum == "000001") $ -- only copy the first solution
                                                      copySolution file $ essenceDir

tests/custom/solution-copy-dashed/p.param

@@ -0,0 +1,5 @@
+$ sumplete 1 x 1 instance generated by ./sumplete-gen.pl -s 42
+letting n be 1
+letting c be [[4]]
+letting rt be [0]
+letting ct be [0]

tests/custom/solution-copy-dashed/run.sh

@@ -0,0 +1,6 @@
+rm -rf conjure-output *.solution
+conjure solve sumplete-2023053102.essence p.param
+ls -1 *.solution
+conjure solve sumplete-2023053102.essence sumplete-1x1-42.param
+ls -1 *.solution
+rm -rf conjure-output *.solution

tests/custom/solution-copy-dashed/stdout.expected

@@ -0,0 +1,15 @@
+Generating models for sumplete-2023053102.essence
+Generated models: model000001.eprime
+Saved under: conjure-output
+Savile Row: model000001.eprime p.param
+Running minion for domain filtering.
+Running solver: minion
+Copying solution to: sumplete-2023053102-p.solution
+sumplete-2023053102-p.solution
+Using cached models.
+Savile Row: model000001.eprime sumplete-1x1-42.param
+Running minion for domain filtering.
+Running solver: minion
+Copying solution to: sumplete-2023053102-sumplete-1x1-42.solution
+sumplete-2023053102-p.solution
+sumplete-2023053102-sumplete-1x1-42.solution

tests/custom/solution-copy-dashed/sumplete-1x1-42.param

@@ -0,0 +1,5 @@
+$ sumplete 1 x 1 instance generated by ./sumplete-gen.pl -s 42
+letting n be 1
+letting c be [[4]]
+letting rt be [0]
+letting ct be [0]

tests/custom/solution-copy-dashed/sumplete-2023053102.essence

@@ -0,0 +1,18 @@
+$ https://sumplete.com/
+$ delete numbers so each row and column adds up to the target number
+
+given n : int(1..)
+letting M be n*9 $ largest possible target number
+letting rows be domain int(1..n)
+letting cols be domain int(1..n)
+letting digits be domain int(1..9)
+letting targets be domain int(0..M)
+
+given c : matrix indexed by [rows,cols] of digits
+given rt : matrix indexed by [rows] of targets
+given ct : matrix indexed by [cols] of targets
+
+find d : function (total) (rows,cols) --> int(0..1)
+such that
+  forAll i : rows . (sum j : cols . d((i,j))*c[i,j]) = rt[i]
+, forAll j : cols . (sum i : rows . d((i,j))*c[i,j]) = ct[j]