Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ regex = { version = "1.0", optional = true}
regex-lite = { version = "0.1.6", optional = true}
bitcode = "0.6.3"
csv = "1.3.0"
statrs = { version = "0.18", default-features = false }

[features]
default = ["use_regex_full"]
Expand Down
26 changes: 26 additions & 0 deletions base/src/expressions/parser/static_analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,19 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
Function::Randbetween => args_signature_scalars(arg_count, 2, 0),
Function::Formulatext => args_signature_scalars(arg_count, 1, 0),
Function::Unicode => args_signature_scalars(arg_count, 1, 0),
Function::BetaDist => args_signature_scalars(arg_count, 4, 2),
Function::BetaInv => args_signature_scalars(arg_count, 3, 2),
Function::BinomDist => args_signature_scalars(arg_count, 4, 0),
Function::BinomDistRange => args_signature_scalars(arg_count, 3, 1),
Function::BinomInv => args_signature_scalars(arg_count, 3, 0),
Function::ExponDist => args_signature_scalars(arg_count, 3, 0),
Function::Gamma => args_signature_scalars(arg_count, 1, 0),
Function::GammaDist => args_signature_scalars(arg_count, 4, 0),
Function::GammaInv => args_signature_scalars(arg_count, 3, 0),
Function::Gammaln => args_signature_scalars(arg_count, 1, 0),
Function::GammalnPrecise => args_signature_scalars(arg_count, 1, 0),
Function::PoissonDist => args_signature_scalars(arg_count, 3, 0),
Function::WeibullDist => args_signature_scalars(arg_count, 4, 0),
Function::Geomean => vec![Signature::Vector; arg_count],
}
}
Expand Down Expand Up @@ -989,6 +1002,19 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
Function::Randbetween => scalar_arguments(args),
Function::Eomonth => scalar_arguments(args),
Function::Formulatext => not_implemented(args),
Function::BetaDist => scalar_arguments(args),
Function::BetaInv => scalar_arguments(args),
Function::BinomDist => scalar_arguments(args),
Function::BinomDistRange => scalar_arguments(args),
Function::BinomInv => scalar_arguments(args),
Function::ExponDist => scalar_arguments(args),
Function::Gamma => scalar_arguments(args),
Function::GammaDist => scalar_arguments(args),
Function::GammaInv => scalar_arguments(args),
Function::Gammaln => scalar_arguments(args),
Function::GammalnPrecise => scalar_arguments(args),
Function::PoissonDist => scalar_arguments(args),
Function::WeibullDist => scalar_arguments(args),
Function::Geomean => not_implemented(args),
}
}
67 changes: 66 additions & 1 deletion base/src/functions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,19 @@ pub enum Function {
Maxifs,
Minifs,
Geomean,
BetaDist,
BetaInv,
BinomDist,
BinomDistRange,
BinomInv,
ExponDist,
Gamma,
GammaDist,
GammaInv,
Gammaln,
GammalnPrecise,
PoissonDist,
WeibullDist,

// Date and time
Date,
Expand Down Expand Up @@ -253,7 +266,7 @@ pub enum Function {
}

impl Function {
pub fn into_iter() -> IntoIter<Function, 198> {
pub fn into_iter() -> IntoIter<Function, 211> {
[
Function::And,
Function::False,
Expand Down Expand Up @@ -357,6 +370,19 @@ impl Function {
Function::Maxifs,
Function::Minifs,
Function::Geomean,
Function::BetaDist,
Function::BetaInv,
Function::BinomDist,
Function::BinomDistRange,
Function::BinomInv,
Function::ExponDist,
Function::Gamma,
Function::GammaDist,
Function::GammaInv,
Function::Gammaln,
Function::GammalnPrecise,
Function::PoissonDist,
Function::WeibullDist,
Function::Year,
Function::Day,
Function::Month,
Expand Down Expand Up @@ -625,6 +651,19 @@ impl Function {
"MAXIFS" | "_XLFN.MAXIFS" => Some(Function::Maxifs),
"MINIFS" | "_XLFN.MINIFS" => Some(Function::Minifs),
"GEOMEAN" => Some(Function::Geomean),
"BETA.DIST" => Some(Function::BetaDist),
"BETA.INV" => Some(Function::BetaInv),
"BINOM.DIST" => Some(Function::BinomDist),
"BINOM.DIST.RANGE" => Some(Function::BinomDistRange),
"BINOM.INV" => Some(Function::BinomInv),
"EXPON.DIST" => Some(Function::ExponDist),
"GAMMA" => Some(Function::Gamma),
"GAMMA.DIST" => Some(Function::GammaDist),
"GAMMA.INV" => Some(Function::GammaInv),
"GAMMALN" => Some(Function::Gammaln),
"GAMMALN.PRECISE" => Some(Function::GammalnPrecise),
"POISSON.DIST" => Some(Function::PoissonDist),
"WEIBULL.DIST" => Some(Function::WeibullDist),
// Date and Time
"YEAR" => Some(Function::Year),
"DAY" => Some(Function::Day),
Expand Down Expand Up @@ -836,6 +875,19 @@ impl fmt::Display for Function {
Function::Maxifs => write!(f, "MAXIFS"),
Function::Minifs => write!(f, "MINIFS"),
Function::Geomean => write!(f, "GEOMEAN"),
Function::BetaDist => write!(f, "BETA.DIST"),
Function::BetaInv => write!(f, "BETA.INV"),
Function::BinomDist => write!(f, "BINOM.DIST"),
Function::BinomDistRange => write!(f, "BINOM.DIST.RANGE"),
Function::BinomInv => write!(f, "BINOM.INV"),
Function::ExponDist => write!(f, "EXPON.DIST"),
Function::Gamma => write!(f, "GAMMA"),
Function::GammaDist => write!(f, "GAMMA.DIST"),
Function::GammaInv => write!(f, "GAMMA.INV"),
Function::Gammaln => write!(f, "GAMMALN"),
Function::GammalnPrecise => write!(f, "GAMMALN.PRECISE"),
Function::PoissonDist => write!(f, "POISSON.DIST"),
Function::WeibullDist => write!(f, "WEIBULL.DIST"),
Function::Year => write!(f, "YEAR"),
Function::Day => write!(f, "DAY"),
Function::Month => write!(f, "MONTH"),
Expand Down Expand Up @@ -1076,6 +1128,19 @@ impl Model {
Function::Maxifs => self.fn_maxifs(args, cell),
Function::Minifs => self.fn_minifs(args, cell),
Function::Geomean => self.fn_geomean(args, cell),
Function::BetaDist => self.fn_beta_dist(args, cell),
Function::BetaInv => self.fn_beta_inv(args, cell),
Function::BinomDist => self.fn_binom_dist(args, cell),
Function::BinomDistRange => self.fn_binom_dist_range(args, cell),
Function::BinomInv => self.fn_binom_inv(args, cell),
Function::ExponDist => self.fn_expon_dist(args, cell),
Function::Gamma => self.fn_gamma(args, cell),
Function::GammaDist => self.fn_gamma_dist(args, cell),
Function::GammaInv => self.fn_gamma_inv(args, cell),
Function::Gammaln => self.fn_gammaln(args, cell),
Function::GammalnPrecise => self.fn_gammaln_precise(args, cell),
Function::PoissonDist => self.fn_poisson_dist(args, cell),
Function::WeibullDist => self.fn_weibull_dist(args, cell),
// Date and Time
Function::Year => self.fn_year(args, cell),
Function::Day => self.fn_day(args, cell),
Expand Down
Loading