rm progress_bar from mc

hetalang · Sep 18, 2023 · ec5f1fa · ec5f1fa
1 parent 5069673
commit ec5f1fa
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/monte_carlo.jl b/src/monte_carlo.jl
@@ -59,11 +59,11 @@ function mc(
   parameters_variation_nt = NamedTuple(parameters_variation)
 
   #(parallel_type == EnsembleSerial()) # tmp fix
-  p = Progress(num_iter, dt=0.5, barglyphs=BarGlyphs("[=> ]"), barlen=50, enabled = progress_bar)
+  #p = Progress(num_iter, dt=0.5, barglyphs=BarGlyphs("[=> ]"), barlen=50, enabled = progress_bar)
 
   function prob_func(prob,i,repeat)
     verbose && println("Processing iteration $i")
-    progress_bar && (parallel_type != EnsembleDistributed() ? next!(p) : put!(progch, true))
+    #progress_bar && (parallel_type != EnsembleDistributed() ? next!(p) : put!(progch, true))
 
     prob_i = remake_prob(scenario, generate_cons(parameters_variation_nt, i); safetycopy=true)
     return prob_i
@@ -92,7 +92,7 @@ function mc(
     reduction = reduction_func,
     safetycopy = false
   )
-
+  #=
   if progress_bar && (parallel_type == EnsembleDistributed())
     @sync begin
       @async while take!(progch)
@@ -112,6 +112,7 @@ function mc(
       end
     end
   else
+  =#
     solution = solve(prob, alg, parallel_type;
       trajectories = num_iter,
       reltol = reltol,
@@ -121,7 +122,8 @@ function mc(
       save_everystep = false,
       kwargs...
     )
-  end
+
+  #end
 
   return MCResult(solution.u, has_saveat(scenario), scenario)
 end
@@ -225,12 +227,12 @@ function mc(
   lc = length(scenario_pairs)
   iter = collect(Iterators.product(1:lp,1:lc))
 
-  p = Progress(num_iter, dt=0.5, barglyphs=BarGlyphs("[=> ]"), barlen=50, enabled=progress_bar)
+  #p = Progress(num_iter, dt=0.5, barglyphs=BarGlyphs("[=> ]"), barlen=50, enabled=progress_bar)
 
   function prob_func(prob,i,repeat)
     iter_i = iter[i]
     verbose && println("Processing scenario $(iter_i[2]) iteration $(iter_i[1])")
-    progress_bar && (parallel_type != EnsembleDistributed() ? next!(p) : put!(progch, true))
+    #progress_bar && (parallel_type != EnsembleDistributed() ? next!(p) : put!(progch, true))
 
     scn_i = last(scenario_pairs[iter_i[2]])
     parameters_i = parameters_pregenerated[iter_i[1]]
@@ -262,7 +264,7 @@ function mc(
     reduction = reduction_func,
     safetycopy = false
   )
-
+  #=
   if progress_bar && (parallel_type == EnsembleDistributed())
     @sync begin
       @async while take!(progch)
@@ -282,6 +284,8 @@ function mc(
       end
     end
   else
+    =#
+
     solution = solve(prob, alg, parallel_type;
       trajectories = lp*lc,
       reltol = reltol,
@@ -291,7 +295,8 @@ function mc(
       save_everystep = false,
       kwargs...
     )
-  end
+
+  #end
 
   ret = Vector{Pair{Symbol,MCResult}}(undef, lc)