merge duration, mduration #44
merge price, yield #29 merge fvschedule #56 merge pricedisc, pricemat, yielddisc, yieldmat, disc, received, intrate #57 merge accrint, accrintm #58 merge coupdaybs, coupdays, coupdaysnc, coupncd, coupnum, couppcd #59 fix cursor refactor refactor fix build
This commit is contained in:
Brian Hung
committed by
Nicolás Hatcher
Nicolás Hatcher
parent
d4f69f2ec2
commit
557582934b
File diff suppressed because it is too large
Load Diff
@@ -217,6 +217,14 @@ pub enum Function {
|
||||
Isoweeknum,
|
||||
|
||||
// Financial
|
||||
Accrint,
|
||||
Accrintm,
|
||||
Coupdaybs,
|
||||
Coupdays,
|
||||
Coupdaysnc,
|
||||
Coupncd,
|
||||
Coupnum,
|
||||
Couppcd,
|
||||
Cumipmt,
|
||||
Cumprinc,
|
||||
Db,
|
||||
@@ -225,6 +233,7 @@ pub enum Function {
|
||||
Dollarfr,
|
||||
Effect,
|
||||
Fv,
|
||||
Fvschedule,
|
||||
Ipmt,
|
||||
Irr,
|
||||
Ispmt,
|
||||
@@ -232,9 +241,12 @@ pub enum Function {
|
||||
Nominal,
|
||||
Nper,
|
||||
Npv,
|
||||
Duration,
|
||||
Mduration,
|
||||
Pduration,
|
||||
Pmt,
|
||||
Ppmt,
|
||||
Price,
|
||||
Pv,
|
||||
Rate,
|
||||
Rri,
|
||||
@@ -243,8 +255,16 @@ pub enum Function {
|
||||
Tbilleq,
|
||||
Tbillprice,
|
||||
Tbillyield,
|
||||
Pricedisc,
|
||||
Pricemat,
|
||||
Yielddisc,
|
||||
Yieldmat,
|
||||
Disc,
|
||||
Received,
|
||||
Intrate,
|
||||
Xirr,
|
||||
Xnpv,
|
||||
Yield,
|
||||
|
||||
// Engineering: Bessel and transcendental functions
|
||||
Besseli,
|
||||
@@ -313,7 +333,7 @@ pub enum Function {
|
||||
}
|
||||
|
||||
impl Function {
|
||||
pub fn into_iter() -> IntoIter<Function, 256> {
|
||||
pub fn into_iter() -> IntoIter<Function, 276> {
|
||||
[
|
||||
Function::And,
|
||||
Function::False,
|
||||
@@ -474,18 +494,23 @@ impl Function {
|
||||
Function::WorkdayIntl,
|
||||
Function::Yearfrac,
|
||||
Function::Isoweeknum,
|
||||
Function::Accrint,
|
||||
Function::Accrintm,
|
||||
Function::Pmt,
|
||||
Function::Pv,
|
||||
Function::Rate,
|
||||
Function::Nper,
|
||||
Function::Fv,
|
||||
Function::Fvschedule,
|
||||
Function::Ppmt,
|
||||
Function::Price,
|
||||
Function::Ipmt,
|
||||
Function::Npv,
|
||||
Function::Mirr,
|
||||
Function::Irr,
|
||||
Function::Xirr,
|
||||
Function::Xnpv,
|
||||
Function::Yield,
|
||||
Function::Rept,
|
||||
Function::Textafter,
|
||||
Function::Textbefore,
|
||||
@@ -497,10 +522,25 @@ impl Function {
|
||||
Function::Syd,
|
||||
Function::Nominal,
|
||||
Function::Effect,
|
||||
Function::Duration,
|
||||
Function::Mduration,
|
||||
Function::Pduration,
|
||||
Function::Coupdaybs,
|
||||
Function::Coupdays,
|
||||
Function::Coupdaysnc,
|
||||
Function::Coupncd,
|
||||
Function::Coupnum,
|
||||
Function::Couppcd,
|
||||
Function::Tbillyield,
|
||||
Function::Tbillprice,
|
||||
Function::Tbilleq,
|
||||
Function::Pricedisc,
|
||||
Function::Pricemat,
|
||||
Function::Yielddisc,
|
||||
Function::Yieldmat,
|
||||
Function::Disc,
|
||||
Function::Received,
|
||||
Function::Intrate,
|
||||
Function::Dollarde,
|
||||
Function::Dollarfr,
|
||||
Function::Ddb,
|
||||
@@ -813,15 +853,20 @@ impl Function {
|
||||
"YEARFRAC" => Some(Function::Yearfrac),
|
||||
"ISOWEEKNUM" | "_XLFN.ISOWEEKNUM" => Some(Function::Isoweeknum),
|
||||
// Financial
|
||||
"ACCRINT" => Some(Function::Accrint),
|
||||
"ACCRINTM" => Some(Function::Accrintm),
|
||||
"PMT" => Some(Function::Pmt),
|
||||
"PV" => Some(Function::Pv),
|
||||
"RATE" => Some(Function::Rate),
|
||||
"NPER" => Some(Function::Nper),
|
||||
"FV" => Some(Function::Fv),
|
||||
"FVSCHEDULE" => Some(Function::Fvschedule),
|
||||
"PPMT" => Some(Function::Ppmt),
|
||||
"PRICE" => Some(Function::Price),
|
||||
"IPMT" => Some(Function::Ipmt),
|
||||
"NPV" => Some(Function::Npv),
|
||||
"XNPV" => Some(Function::Xnpv),
|
||||
"YIELD" => Some(Function::Yield),
|
||||
"MIRR" => Some(Function::Mirr),
|
||||
"IRR" => Some(Function::Irr),
|
||||
"XIRR" => Some(Function::Xirr),
|
||||
@@ -832,11 +877,27 @@ impl Function {
|
||||
"SYD" => Some(Function::Syd),
|
||||
"NOMINAL" => Some(Function::Nominal),
|
||||
"EFFECT" => Some(Function::Effect),
|
||||
"DURATION" => Some(Function::Duration),
|
||||
"MDURATION" => Some(Function::Mduration),
|
||||
"PDURATION" | "_XLFN.PDURATION" => Some(Function::Pduration),
|
||||
|
||||
"COUPDAYBS" => Some(Function::Coupdaybs),
|
||||
"COUPDAYS" => Some(Function::Coupdays),
|
||||
"COUPDAYSNC" => Some(Function::Coupdaysnc),
|
||||
"COUPNCD" => Some(Function::Coupncd),
|
||||
"COUPNUM" => Some(Function::Coupnum),
|
||||
"COUPPCD" => Some(Function::Couppcd),
|
||||
|
||||
"TBILLYIELD" => Some(Function::Tbillyield),
|
||||
"TBILLPRICE" => Some(Function::Tbillprice),
|
||||
"TBILLEQ" => Some(Function::Tbilleq),
|
||||
"PRICEDISC" => Some(Function::Pricedisc),
|
||||
"PRICEMAT" => Some(Function::Pricemat),
|
||||
"YIELDDISC" => Some(Function::Yielddisc),
|
||||
"YIELDMAT" => Some(Function::Yieldmat),
|
||||
"DISC" => Some(Function::Disc),
|
||||
"RECEIVED" => Some(Function::Received),
|
||||
"INTRATE" => Some(Function::Intrate),
|
||||
|
||||
"DOLLARDE" => Some(Function::Dollarde),
|
||||
"DOLLARFR" => Some(Function::Dollarfr),
|
||||
@@ -1052,18 +1113,23 @@ impl fmt::Display for Function {
|
||||
Function::WorkdayIntl => write!(f, "WORKDAY.INTL"),
|
||||
Function::Yearfrac => write!(f, "YEARFRAC"),
|
||||
Function::Isoweeknum => write!(f, "ISOWEEKNUM"),
|
||||
Function::Accrint => write!(f, "ACCRINT"),
|
||||
Function::Accrintm => write!(f, "ACCRINTM"),
|
||||
Function::Pmt => write!(f, "PMT"),
|
||||
Function::Pv => write!(f, "PV"),
|
||||
Function::Rate => write!(f, "RATE"),
|
||||
Function::Nper => write!(f, "NPER"),
|
||||
Function::Fv => write!(f, "FV"),
|
||||
Function::Fvschedule => write!(f, "FVSCHEDULE"),
|
||||
Function::Ppmt => write!(f, "PPMT"),
|
||||
Function::Price => write!(f, "PRICE"),
|
||||
Function::Ipmt => write!(f, "IPMT"),
|
||||
Function::Npv => write!(f, "NPV"),
|
||||
Function::Mirr => write!(f, "MIRR"),
|
||||
Function::Irr => write!(f, "IRR"),
|
||||
Function::Xirr => write!(f, "XIRR"),
|
||||
Function::Xnpv => write!(f, "XNPV"),
|
||||
Function::Yield => write!(f, "YIELD"),
|
||||
Function::Rept => write!(f, "REPT"),
|
||||
Function::Textafter => write!(f, "TEXTAFTER"),
|
||||
Function::Textbefore => write!(f, "TEXTBEFORE"),
|
||||
@@ -1075,10 +1141,25 @@ impl fmt::Display for Function {
|
||||
Function::Syd => write!(f, "SYD"),
|
||||
Function::Nominal => write!(f, "NOMINAL"),
|
||||
Function::Effect => write!(f, "EFFECT"),
|
||||
Function::Duration => write!(f, "DURATION"),
|
||||
Function::Mduration => write!(f, "MDURATION"),
|
||||
Function::Pduration => write!(f, "PDURATION"),
|
||||
Function::Coupdaybs => write!(f, "COUPDAYBS"),
|
||||
Function::Coupdays => write!(f, "COUPDAYS"),
|
||||
Function::Coupdaysnc => write!(f, "COUPDAYSNC"),
|
||||
Function::Coupncd => write!(f, "COUPNCD"),
|
||||
Function::Coupnum => write!(f, "COUPNUM"),
|
||||
Function::Couppcd => write!(f, "COUPPCD"),
|
||||
Function::Tbillyield => write!(f, "TBILLYIELD"),
|
||||
Function::Tbillprice => write!(f, "TBILLPRICE"),
|
||||
Function::Tbilleq => write!(f, "TBILLEQ"),
|
||||
Function::Pricedisc => write!(f, "PRICEDISC"),
|
||||
Function::Pricemat => write!(f, "PRICEMAT"),
|
||||
Function::Yielddisc => write!(f, "YIELDDISC"),
|
||||
Function::Yieldmat => write!(f, "YIELDMAT"),
|
||||
Function::Disc => write!(f, "DISC"),
|
||||
Function::Received => write!(f, "RECEIVED"),
|
||||
Function::Intrate => write!(f, "INTRATE"),
|
||||
Function::Dollarde => write!(f, "DOLLARDE"),
|
||||
Function::Dollarfr => write!(f, "DOLLARFR"),
|
||||
Function::Ddb => write!(f, "DDB"),
|
||||
@@ -1329,18 +1410,24 @@ impl Model {
|
||||
Function::WorkdayIntl => self.fn_workday_intl(args, cell),
|
||||
Function::Yearfrac => self.fn_yearfrac(args, cell),
|
||||
Function::Isoweeknum => self.fn_isoweeknum(args, cell),
|
||||
// Financial
|
||||
Function::Accrint => self.fn_accrint(args, cell),
|
||||
Function::Accrintm => self.fn_accrintm(args, cell),
|
||||
Function::Pmt => self.fn_pmt(args, cell),
|
||||
Function::Pv => self.fn_pv(args, cell),
|
||||
Function::Rate => self.fn_rate(args, cell),
|
||||
Function::Nper => self.fn_nper(args, cell),
|
||||
Function::Fv => self.fn_fv(args, cell),
|
||||
Function::Fvschedule => self.fn_fvschedule(args, cell),
|
||||
Function::Ppmt => self.fn_ppmt(args, cell),
|
||||
Function::Price => self.fn_price(args, cell),
|
||||
Function::Ipmt => self.fn_ipmt(args, cell),
|
||||
Function::Npv => self.fn_npv(args, cell),
|
||||
Function::Mirr => self.fn_mirr(args, cell),
|
||||
Function::Irr => self.fn_irr(args, cell),
|
||||
Function::Xirr => self.fn_xirr(args, cell),
|
||||
Function::Xnpv => self.fn_xnpv(args, cell),
|
||||
Function::Yield => self.fn_yield(args, cell),
|
||||
Function::Rept => self.fn_rept(args, cell),
|
||||
Function::Textafter => self.fn_textafter(args, cell),
|
||||
Function::Textbefore => self.fn_textbefore(args, cell),
|
||||
@@ -1352,10 +1439,25 @@ impl Model {
|
||||
Function::Syd => self.fn_syd(args, cell),
|
||||
Function::Nominal => self.fn_nominal(args, cell),
|
||||
Function::Effect => self.fn_effect(args, cell),
|
||||
Function::Duration => self.fn_duration(args, cell),
|
||||
Function::Mduration => self.fn_mduration(args, cell),
|
||||
Function::Pduration => self.fn_pduration(args, cell),
|
||||
Function::Coupdaybs => self.fn_coupdaybs(args, cell),
|
||||
Function::Coupdays => self.fn_coupdays(args, cell),
|
||||
Function::Coupdaysnc => self.fn_coupdaysnc(args, cell),
|
||||
Function::Coupncd => self.fn_coupncd(args, cell),
|
||||
Function::Coupnum => self.fn_coupnum(args, cell),
|
||||
Function::Couppcd => self.fn_couppcd(args, cell),
|
||||
Function::Tbillyield => self.fn_tbillyield(args, cell),
|
||||
Function::Tbillprice => self.fn_tbillprice(args, cell),
|
||||
Function::Tbilleq => self.fn_tbilleq(args, cell),
|
||||
Function::Pricedisc => self.fn_pricedisc(args, cell),
|
||||
Function::Pricemat => self.fn_pricemat(args, cell),
|
||||
Function::Yielddisc => self.fn_yielddisc(args, cell),
|
||||
Function::Yieldmat => self.fn_yieldmat(args, cell),
|
||||
Function::Disc => self.fn_disc(args, cell),
|
||||
Function::Received => self.fn_received(args, cell),
|
||||
Function::Intrate => self.fn_intrate(args, cell),
|
||||
Function::Dollarde => self.fn_dollarde(args, cell),
|
||||
Function::Dollarfr => self.fn_dollarfr(args, cell),
|
||||
Function::Ddb => self.fn_ddb(args, cell),
|
||||
|
||||
Reference in New Issue
Block a user