Enhance the command list for the solution

This patch moves the formatting of the command list to Cluster.hs and
enhances it with separator messages between the steps.

diff --git a/src/Cluster.hs b/src/Cluster.hs
index 0247e6a..8494491 100644 (file)
--- a/src/Cluster.hs
+++ b/src/Cluster.hs
@@ -23,6 +23,7 @@ module Cluster
     , applySolution
     , printSolution
     , printSolutionLine
+    , formatCmds
     , printNodes
     -- * Balacing functions
     , checkMove
@@ -569,6 +570,13 @@ printSolutionLine il ktn kti nmlen imlen plc =
        pmlen nstr c moves,
        cmds)
 
+formatCmds :: [[String]] -> String
+formatCmds cmd_strs =
+    unlines $ map ("  echo " ++) $
+    concat $ map (\(a, b) ->
+        (printf "step %d" (a::Int)):(map ("gnt-instance" ++) b)) $
+        zip [1..] cmd_strs
+
 {-| Converts a solution to string format -}
 printSolution :: InstanceList
               -> [(Int, String)]

diff --git a/src/hbal.hs b/src/hbal.hs
index 352fbb4..06d85c5 100644 (file)
--- a/src/hbal.hs
+++ b/src/hbal.hs
@@ -185,8 +185,7 @@ main = do
        do
          putStrLn ""
          putStrLn "Commands to run to reach the above solution:"
-         putStr $ unlines $ map ("  echo gnt-instance " ++)
-                    $ concat $ reverse cmd_strs
+         putStr . Cluster.formatCmds . reverse $ cmd_strs
   when (optShowNodes opts) $
        do
          let (orig_mem, orig_disk) = Cluster.totalResources nl

diff --git a/src/hn1.hs b/src/hn1.hs
index cb84392..5506e8a 100644 (file)
--- a/src/hn1.hs
+++ b/src/hn1.hs
@@ -187,7 +187,8 @@ main = do
        do
          putStrLn ""
          putStrLn "Commands to run to reach the above solution:"
-         putStr $ unlines $ map ("  echo gnt-instance " ++) $ concat cmd_strs
+         putStr . Cluster.formatCmds . reverse $ cmd_strs
+
   when (optShowNodes opts) $
        do
          let (orig_mem, orig_disk) = Cluster.totalResources nl