Refactor Max amplitudes argument and bump version number

JuliaQX · May 7, 2021 · 165e028 · 165e028
1 parent 5d1c8d5
commit 165e028
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "QXContexts"
 uuid = "04c26001-d4a1-49d2-b090-1d469cf06784"
 authors = ["QuantEx team"]
-version = "0.1.8"
+version = "0.1.9"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

diff --git a/src/execution.jl b/src/execution.jl
@@ -332,7 +332,6 @@ function execute(dsl_file::String,
     # produce bitstrings to compute amplitudes for.
     commands = parse_dsl(dsl_file)
     sampler_args, partition_params = parse_parameters(param_file,
-                                                      max_amplitudes=max_amplitudes, 
                                                       max_parameters=max_parameters)
 
     # Create a context to execute the commands in.
@@ -347,7 +346,7 @@ function execute(dsl_file::String,
 
     # Create a sampler to produce bitstrings to get amplitudes for and a variable to store 
     # the results.
-    sampler = QXContexts.Sampling.create_sampler(sampler_args, ctx)
+    sampler = QXContexts.Sampling.create_sampler(sampler_args, ctx, max_amplitudes)
     results = Samples()
 
     # For each bitstring produced by the sampler, compute its amplitude and accept or reject

diff --git a/src/parameters.jl b/src/parameters.jl
@@ -8,8 +8,7 @@ import Base.Iterators: take
 
 """
     parse_parameters(filename::String;
-                     max_parameters::Union{Int, Nothing}=nothing,
-                     max_amplitudes::Union{Int, Nothing}=nothing)
+                     max_parameters::Union{Int, Nothing}=nothing)
 
 Parse the parameters yml file to read information about partition parameters and output 
 sampling method.
@@ -29,8 +28,7 @@ output:
       - "10101"
 """
 function parse_parameters(filename::String;
-                          max_parameters::Union{Int, Nothing}=nothing,
-                          max_amplitudes::Union{Int, Nothing}=nothing)
+                          max_parameters::Union{Int, Nothing}=nothing)
     param_dict = YAML.load_file(filename, dicttype=OrderedDict{String, Any})
 
     # parse the partition paramters section of the parameter file
@@ -41,7 +39,6 @@ function parse_parameters(filename::String;
     # parse the output method section of the parameter file
     method_params = OrderedDict{Symbol, Any}(Symbol(x[1]) => x[2] for x in param_dict["output"])
     method_params[:params] = OrderedDict{Symbol, Any}(Symbol(x[1]) => x[2] for x in method_params[:params])
-    max_amplitudes === nothing || (method_params[:params][:num_samples] = max_amplitudes)
 
     return method_params, partition_params
 end

diff --git a/src/sampling.jl b/src/sampling.jl
@@ -205,8 +205,6 @@ end
 Returns a sampler whose type is specified in `params`.
 """
 create_sampler(params) = get_constructor(params[:method])(;params[:params]...)
-get_constructor(func_name::String) = getfield(Main, Symbol(func_name*"Sampler"))
-
 create_sampler(params, ctx::QXContext{T}) where T = create_sampler(params)
 
 function create_sampler(params, ctx::QXMPIContext)
@@ -215,4 +213,11 @@ function create_sampler(params, ctx::QXMPIContext)
     create_sampler(params)
 end
 
+function create_sampler(params, ctx, max_amplitudes=nothing)
+    max_amplitudes === nothing || (params[:params][:num_samples] = max_amplitudes)
+    create_sampler(params, ctx)
+end
+
+get_constructor(func_name::String) = getfield(Main, Symbol(func_name*"Sampler"))
+
 end