From b240de4c9808186b4350e29c1180b8a81af3f4a4 Mon Sep 17 00:00:00 2001 From: SHICHEN XIE Date: Wed, 10 Jan 2024 20:48:50 +0800 Subject: [PATCH] 0.2.4 --- CRAN-SUBMISSION | 4 +-- README.Rmd | 2 +- README.md | 4 +-- docs/authors.html | 4 +-- docs/index.html | 4 +-- docs/news/index.html | 8 ++++-- docs/pkgdown.yml | 2 +- docs/reference/crossover.html | 3 +-- docs/reference/pq_plot.html | 42 ++++++++++---------------------- docs/reference/pq_portfolio.html | 41 ++++++------------------------- docs/reference/pq_return.html | 6 ++--- 11 files changed, 40 insertions(+), 80 deletions(-) diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index f687a4c..02504b2 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ Version: 0.2.4 -Date: 2023-12-24 04:47:39 UTC -SHA: 6accc255066d6e76c72e09611dec883f0150cac5 +Date: 2024-01-09 12:58:44 UTC +SHA: 102c41bce6d56d722d0283c6b555935bdc5e9244 diff --git a/README.Rmd b/README.Rmd index cbb7958..ee57f04 100644 --- a/README.Rmd +++ b/README.Rmd @@ -20,7 +20,7 @@ knitr::opts_chunk$set( `pedquant` (Public Economic Data and QUANTitative analysis) provides an interface to access public economic and financial data for economic research and quantitative analysis. The functions are grouped into three main categories, -- ed\_\* (economic data) functions load economic data from [NBS](http://www.stats.gov.cn/) and [FRED](https://fred.stlouisfed.org/); +- ed\_\* (economic data) functions load economic data from [NBS](https://www.stats.gov.cn/) and [FRED](https://fred.stlouisfed.org/); - md\_\* (market data) functions load the forex, money, bond, stock, future market data from public data sources, including 163, Sina, qq finance and etc. - pq\_\* (quantitative analysis) functions create technical indicators, visualization charts and industrial index etc for time series data. diff --git a/README.md b/README.md index 1e5bf23..a192604 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ research and quantitative analysis. The functions are grouped into three main categories, - ed\_\* (economic data) functions load economic data from - [NBS](http://www.stats.gov.cn/) and + [NBS](https://www.stats.gov.cn/) and [FRED](https://fred.stlouisfed.org/); - md\_\* (market data) functions load the forex, money, bond, stock, future market data from public data sources, including 163, Sina, qq @@ -59,7 +59,7 @@ The following examples show you how to import data. library(pedquant) packageVersion('pedquant') - #> [1] '0.2.2.999' + #> [1] '0.2.4' # loading data ## import eocnomic data dat1 = ed_fred('GDPCA') diff --git a/docs/authors.html b/docs/authors.html index 8113ee4..e79d551 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -72,14 +72,14 @@

Citation

-

Xie S (2023). +

Xie S (2024). pedquant: Public Economic Data and Quantitative Analysis. R package version 0.2.4, https://github.com/ShichenXie/pedquant. 

@Manual{,
   title = {pedquant: Public Economic Data and Quantitative Analysis},
   author = {Shichen Xie},
-  year = {2023},
+  year = {2024},
   note = {R package version 0.2.4},
   url = {https://github.com/ShichenXie/pedquant},
 }
diff --git a/docs/index.html b/docs/index.html index 018fe03..8104807 100644 --- a/docs/index.html +++ b/docs/index.html @@ -87,7 +87,7 @@

CRAN status

pedquant (Public Economic Data and QUANTitative analysis) provides an interface to access public economic and financial data for economic research and quantitative analysis. The functions are grouped into three main categories,

@@ -111,7 +111,7 @@

ExampleThe following examples show you how to import data.

library(pedquant)
 packageVersion('pedquant')
-#> [1] '0.2.2.999'
+#> [1] '0.2.4'
 # loading data
 ## import eocnomic data
 dat1 = ed_fred('GDPCA')
diff --git a/docs/news/index.html b/docs/news/index.html
index 0a8a472..79547fc 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -17,7 +17,7 @@
       
       
         pedquant
-        0.2.3
+        0.2.4
@@ -59,7 +59,11 @@

Changelog

-

pedquant 0.2.3

+

pedquant 0.2.4

+
  • fixed mutual bugs
    • +
+
+

pedquant 0.2.32023-09-22

  • adjusted order book structure
  • modified symbol suffix of shanghai exchange shares from ‘ss’ to ‘sh’
  • set y-axis starts from ‘dataMin’
    • diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 3976a1e..bf6447c 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,5 +2,5 @@ pandoc: 3.1.1 pkgdown: 2.0.7 pkgdown_sha: ~ articles: {} -last_built: 2023-12-24T04:40Z +last_built: 2024-01-10T12:48Z diff --git a/docs/reference/crossover.html b/docs/reference/crossover.html index 231c496..38127fd 100644 --- a/docs/reference/crossover.html +++ b/docs/reference/crossover.html @@ -101,9 +101,8 @@

    Examples

    #> 5: 601988.SH 中国银行 2022-01-18 5.75 5.7016 5.69960 buy 5.72 e = pq_plot(boc, y='close_adj', addti = list(sma=list(n=200), sma=list(n=50)), orders = orders) -#> Error in bmerge(i, x, leftcols, rightcols, roll, rollends, nomatch, mult, ops, verbose = verbose): Incompatible join types: x.side (character) and i.side (double) e[[1]] -#> Error in eval(expr, envir, enclos): object 'e' not found +#> NULL
diff --git a/docs/reference/pq_plot.html b/docs/reference/pq_plot.html index 8edee92..c24e1a6 100644 --- a/docs/reference/pq_plot.html +++ b/docs/reference/pq_plot.html @@ -2,7 +2,7 @@ creating charts for time series — pq_plot • pedquant +
@@ -144,8 +144,8 @@

Examples

# line chart (default) e1 = pq_plot(dt_ssec, chart_type = 'line') # line chart (default) e1[[1]] -
- +#> NULL + # add technical indicators e2 = pq_plot(dt_ssec, addti = list( sma = list(n = 200), @@ -154,29 +154,13 @@

Examples

macd = list() )) e2[[1]] -
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#> NULL + # linear trend with yaxis in log e3 = pq_plot(dt_ssec, nsd_lm = c(-0.8, 0, 0.8), markline=FALSE) e3[[1]] -
- +#> NULL + # multiple series data(dt_banks) setDT(dt_banks) @@ -186,8 +170,8 @@

elist = pq_plot(dt_banksadj) e4 = pq_plot(dt_banksadj, arrange = list(rows=1, cols=1)) e4[[1]] -
- +#> NULL + # orders b2 = dt_banks[symbol %in% c('601988.SH', '601398.SH')] b2orders = b2[sample(.N, 10), .(symbol, date, prices=close, @@ -195,12 +179,12 @@

e5 = pq_plot(b2, orders=b2orders) e5[[1]] -
- +#> NULL + e6 = pq_plot(b2, orders=b2orders, arrange = list(rows=1, cols=1)) e6[[1]] -
-# } +#> NULL +# }
diff --git a/docs/reference/pq_portfolio.html b/docs/reference/pq_portfolio.html index 2f5fc0c..101952c 100644 --- a/docs/reference/pq_portfolio.html +++ b/docs/reference/pq_portfolio.html @@ -2,7 +2,7 @@ calculating returns/equity of portfolio — pq_portfolio • pedquant +
@@ -121,8 +121,8 @@

Examples

e1 = pq_plot(dtRa, y = 'cumreturns') e1[[1]] -
- +#> NULL + # example II data(dt_ssec) @@ -135,19 +135,8 @@

Examples

e2 = pq_plot(dtRab, y = 'cumreturns', yb = 'cumreturns_000001.SH', addti = list(portfolio=list())) e2[[1]] -
-

-
-
-
-
-
-
-
-
-
-
-
+#> NULL + # example III orders = data.frame(symbol = "000001.SH", @@ -158,24 +147,8 @@

e3 = pq_plot(dtRa2, y = 'close', addti = list(cumreturns=list(), portfolio=list())) e3[[1]] -
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#> NULL +
diff --git a/docs/reference/pq_return.html b/docs/reference/pq_return.html index 7786820..879bd16 100644 --- a/docs/reference/pq_return.html +++ b/docs/reference/pq_return.html @@ -2,7 +2,7 @@ calculating returns by frequency — pq_return • pedquant +
@@ -146,8 +146,8 @@

Examples

e1 = pq_plot(dts_cumreturns, y = 'cumreturns.daily', title='cumreturns', arrange = list(rows=1, cols=1)) e1[[1]] -
-# } +#> NULL +# }