diff --git a/src/Core.jl b/src/Core.jl index 2aa6c0e5e..17ff5d0fc 100644 --- a/src/Core.jl +++ b/src/Core.jl @@ -7,8 +7,7 @@ include("OptionsStruct.jl") include("Operators.jl") include("Options.jl") -import .ProgramConstantsModule: - MAX_DEGREE, BATCH_DIM, FEATURE_DIM, RecordType, DATA_TYPE, LOSS_TYPE +import .ProgramConstantsModule: MAX_DEGREE, RecordType, DATA_TYPE, LOSS_TYPE import .DatasetModule: Dataset import .OptionsStructModule: Options, ComplexityMapping, MutationWeights, sample_mutation import .OptionsModule: Options diff --git a/src/Dataset.jl b/src/Dataset.jl index 96bd3d130..7e96f3cb4 100644 --- a/src/Dataset.jl +++ b/src/Dataset.jl @@ -11,7 +11,7 @@ import DynamicQuantities: import ...InterfaceDynamicQuantitiesModule: get_si_units, get_sym_units import ..UtilsModule: subscriptify -import ..ProgramConstantsModule: BATCH_DIM, FEATURE_DIM, DATA_TYPE, LOSS_TYPE +import ..ProgramConstantsModule: DATA_TYPE, LOSS_TYPE #! format: off import ...deprecate_varmap #! format: on @@ -120,8 +120,8 @@ function Dataset( # Deprecation warning: variable_names = deprecate_varmap(variable_names, varMap, :Dataset) - n = size(X, BATCH_DIM) - nfeatures = size(X, FEATURE_DIM) + n = size(X, 2) + nfeatures = size(X, 1) weighted = weights !== nothing variable_names = if variable_names === nothing ["x$(i)" for i in 1:nfeatures] diff --git a/src/ProgramConstants.jl b/src/ProgramConstants.jl index 607ce08b2..9731ea0b7 100644 --- a/src/ProgramConstants.jl +++ b/src/ProgramConstants.jl @@ -1,8 +1,6 @@ module ProgramConstantsModule const MAX_DEGREE = 2 -const BATCH_DIM = 2 -const FEATURE_DIM = 1 const RecordType = Dict{String,Any} const DATA_TYPE = Number diff --git a/src/SymbolicRegression.jl b/src/SymbolicRegression.jl index 0cb3ee64b..242d3fd30 100644 --- a/src/SymbolicRegression.jl +++ b/src/SymbolicRegression.jl @@ -161,8 +161,6 @@ include("SearchUtils.jl") import .CoreModule: MAX_DEGREE, - BATCH_DIM, - FEATURE_DIM, DATA_TYPE, LOSS_TYPE, RecordType,