Skip to content

Commit 0cd8c4a

Browse files
committed
(core) added limited graph handliung to the interactive CLI
1 parent 5c14ea9 commit 0cd8c4a

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

nimplex.nim

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -703,11 +703,12 @@ when appType != "lib":
703703
if args.len == 0:
704704
styledEcho fgGreen, "\nWelcome to ", styleItalic, "nimplex", resetStyle, "!"
705705
styledEcho "Please provide 3-letter configuration (", styleBright, fgMagenta, "F", resetStyle, fgMagenta, "ull/", styleBright, fgMagenta, "I", resetStyle, fgMagenta,
706-
"nternal/", styleBright, fgMagenta, "R", resetStyle, fgMagenta, "andom/", styleBright, fgMagenta, "G", resetStyle, fgMagenta, "raph)(", styleBright, fgMagenta, "F",
707-
resetStyle, fgMagenta, "ractional/", styleBright, fgMagenta, "I", resetStyle, fgMagenta, "nteger)(", styleBright, fgMagenta, "P", resetStyle, fgMagenta, "rint/",
708-
styleBright, fgMagenta, "S", resetStyle, fgMagenta, "hape/", styleBright, fgMagenta, "N", resetStyle, fgMagenta, "umpPy)", resetStyle, " - e.g. ", styleBright, fgMagenta,
706+
"nternal/", styleBright, fgMagenta, "R", resetStyle, fgMagenta, "andom/", styleBright, fgMagenta, "G", resetStyle, fgMagenta, "raph/", styleBright, fgMagenta,
707+
"L", resetStyle, fgMagenta, "imitedGraph)(", styleBright, fgMagenta, "F", resetStyle, fgMagenta, "ractional/", styleBright, fgMagenta, "I", resetStyle, fgMagenta, "nteger)(",
708+
styleBright, fgMagenta, "P", resetStyle, fgMagenta, "rint/", styleBright, fgMagenta, "S", resetStyle, fgMagenta, "hape/", styleBright, fgMagenta, "N", resetStyle,
709+
fgMagenta, "umpPy)", resetStyle, " - e.g. ", styleBright, fgMagenta,
709710
"FFS/RFP/FIN", resetStyle, ":"
710-
#echo "Configuration (Full/Internal/Random/Graph)(Fractional/Integer)(Print/Shape/Numpysave) - e.g. FFS/RFP/FIN:"
711+
#echo "Configuration (Full/Internal/Random/Graph/LimitedGraph)(Fractional/Integer)(Print/Shape/Numpysave) - e.g. FFS/RFP/FIN:"
711712
let config = readLine(stdin)
712713
configValidation(config)
713714

@@ -724,6 +725,15 @@ when appType != "lib":
724725
ndiv = readLine(stdin).parseInt()
725726
nDivValidation(config, ndiv, dim)
726727

728+
var limitStr: string = ""
729+
if config[0] == 'L':
730+
if config[1] == 'F':
731+
styledEcho "List of float Min/Max limit pairs per each component / simplex dimension, formatted with `[`, `@[`, or `{` - e.g. ", styleBright, fgMagenta, "[[0,1],[0,0.666],[0.167,0.5]]", resetStyle, "):"
732+
limitStr = readLine(stdin).strip()
733+
else:
734+
styledEcho "List of integer Min/Max limit pairs per each component / simplex dimension, expressed as qunata of ndiv, formatted with `[`, `@[`, or `{` - e.g. ", styleBright, fgMagenta, "[[0,12],[0,8],[2,6]]", resetStyle, "):"
735+
limitStr = readLine(stdin).strip()
736+
727737
var npyName: string = "nimplex_" & config[0..1] & "_" & $dim & "_" & $ndiv & ".npy"
728738
if config[2] == 'N':
729739
styledEcho "NumPy Array Output Filename (skip for default: ", fgBlue, npyName, resetStyle, "):"
@@ -732,7 +742,7 @@ when appType != "lib":
732742
npyName = tempIn
733743
styledEcho "Persisting to NumPy array file: ", fgBlue, npyName, resetStyle
734744

735-
taskRouter(config, dim, ndiv, npyName, "")
745+
taskRouter(config, dim, ndiv, npyName, limitStr)
736746

737747
# Configured
738748
elif args[0] == "-c" or args[0] == "--config":

0 commit comments

Comments
 (0)