-}
iterateDepth :: Cluster.Table -- ^ The starting table
-> Int -- ^ Remaining length
- -> Cluster.NameList -- ^ Node idx to name list
- -> Cluster.NameList -- ^ Inst idx to name list
-> Int -- ^ Max node name len
-> Int -- ^ Max instance name len
-> [[String]] -- ^ Current command list
-> Cluster.Score -- ^ Score at which to stop
-> IO (Cluster.Table, [[String]]) -- ^ The resulting table and
-- commands
-iterateDepth ini_tbl max_rounds ktn kti nmlen imlen
+iterateDepth ini_tbl max_rounds nmlen imlen
cmd_strs oneline min_score =
let Cluster.Table ini_nl ini_il ini_cv ini_plc = ini_tbl
all_inst = Container.elems ini_il
in
do
let
- (sol_line, cmds) = Cluster.printSolutionLine ini_il ktn kti
+ (sol_line, cmds) = Cluster.printSolutionLine ini_nl ini_il
nmlen imlen (head fin_plc) fin_plc_len
upd_cmd_strs = cmds:cmd_strs
unless (oneline || fin_plc_len == ini_plc_len) $ do
hFlush stdout
(if fin_cv < ini_cv then -- this round made success, try deeper
if allowed_next && fin_cv > min_score
- then iterateDepth fin_tbl max_rounds ktn kti
+ then iterateDepth fin_tbl max_rounds
nmlen imlen upd_cmd_strs oneline min_score
-- don't go deeper, but return the better solution
else return (fin_tbl, upd_cmd_strs)
let oneline = optOneline opts
verbose = optVerbose opts
- (fixed_nl, il, csf, ktn, kti) <- CLI.loadExternalData opts
+ (fixed_nl, il, csf, _, _) <- CLI.loadExternalData opts
let offline_names = optOffline opts
- all_names = snd . unzip $ ktn
+ all_nodes = Container.elems fixed_nl
+ all_names = map Node.name all_nodes
offline_wrong = filter (\n -> not $ elem n all_names) offline_names
- offline_indices = fst . unzip .
- filter (\(_, n) -> elem n offline_names) $ ktn
+ offline_indices = map Node.idx $
+ filter (\n -> elem (Node.name n) offline_names)
+ all_nodes
when (length offline_wrong > 0) $ do
printf "Wrong node name(s) set as offline: %s\n"
when (optShowNodes opts) $
do
putStrLn "Initial cluster status:"
- putStrLn $ Cluster.printNodes ktn nl
+ putStrLn $ Cluster.printNodes nl
let ini_cv = Cluster.compCV nl
ini_tbl = Cluster.Table nl il ini_cv []
printf "Initial score: %.8f\n" ini_cv)
unless oneline $ putStrLn "Trying to minimize the CV..."
- let mlen_fn = maximum . (map length) . snd . unzip
- imlen = mlen_fn kti
- nmlen = mlen_fn ktn
+ let imlen = cMaxNamelen il
+ nmlen = cMaxNamelen nl
(fin_tbl, cmd_strs) <- iterateDepth ini_tbl (optMaxLength opts)
- ktn kti nmlen imlen [] oneline min_cv
+ nmlen imlen [] oneline min_cv
let (Cluster.Table fin_nl _ fin_cv fin_plc) = fin_tbl
ord_plc = reverse fin_plc
sol_msg = if null fin_plc
(final_mem, final_disk) = Cluster.totalResources fin_nl
putStrLn ""
putStrLn "Final cluster status:"
- putStrLn $ Cluster.printNodes ktn fin_nl
+ putStrLn $ Cluster.printNodes fin_nl
when (verbose > 3) $
do
printf "Original: mem=%d disk=%d\n" orig_mem orig_disk