kalmar/GroupsWithPropertyT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unresolved merge??

Browse Source
This commit is contained in:
kalmarek 2017-09-10 17:37:56 +02:00
parent e761806701
commit 66a38d89aa
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
AutFN.jl
View File

@ -80,22 +80,7 @@ end
function main() function main()
<<<<<<< Updated upstream
parsed_args = parse_commandline() parsed_args = parse_commandline()
=======
tol = parsed_args["tol"]
iterations = parsed_args["iterations"]
solver = SCSSolver(eps=tol, max_iters=iterations, verbose=true, linearsolver=SCS.Indirect)
N = parsed_args["N"]
upper_bound = parsed_args["upper-bound"]
name = "SOutF$N"
name = name*"-$(string(upper_bound))"
S() = generating_set_of_SOutF(N)
>>>>>>> Stashed changes
if parsed_args["cpus"] ≠ nothing if parsed_args["cpus"] ≠ nothing
if parsed_args["cpus"] > cpuinfo_physicalcores() if parsed_args["cpus"] > cpuinfo_physicalcores()
warn("Number of specified cores exceeds the physical core cound. Performance will suffer.") warn("Number of specified cores exceeds the physical core cound. Performance will suffer.")