Merge pull request #299 from massimoaria/develop

Develop

Author: massimoaria

R/Hindex.R

@@ -10,7 +10,7 @@
 #' "author", the argument has the form C("SURNAME1 N","SURNAME2 N",...), in other words, for each author: surname and initials separated by one blank space. If elements=NULL, the function calculates impact indices for all elements contained in the data frame.
 #' i.e for the authors SEMPRONIO TIZIO CAIO and ARIA MASSIMO \code{elements} argument is \code{elements = c("SEMPRONIO TC", "ARIA M")}.
 #' @param sep is the field separator character. This character separates authors in each string of AU column of the bibliographic data frame. The default is \code{sep = ";"}.
-#' @param years is a integer. It indicates the number of years to consider for Hindex calculation. Default is 10.
+#' @param years is a integer. It indicates the number of years to consider for Hindex calculation. Default is Inf.
 #' @return an object of \code{class} "list". It contains two elements: H is a data frame with h-index, g-index and m-index for each author; CitationList is a list with the bibliographic collection for each author.
 #'
 #' 
@@ -45,12 +45,12 @@
 #' 
 #' @export
 
-Hindex <- function(M, field="author", elements=NULL, sep = ";",years=10){
+Hindex <- function(M, field="author", elements=NULL, sep = ";",years=Inf){
 
   #elements=paste("\\\b",elements,"\\\b",sep="")
   M$TC <- as.numeric(M$TC)
   M$PY <- as.numeric(M$PY)
-  M <- M %>% dplyr::filter(!is.na(.data$TC))
+  M <- M %>% dplyr::filter(!is.na(.data$TC) | !is.na(.data$TC))
   #M <- M[M$TC>0,]
 
   Today=as.numeric(substr(Sys.time(),1,4))
@@ -87,7 +87,6 @@ Hindex <- function(M, field="author", elements=NULL, sep = ";",years=10){
     group_by(.data$AUs) %>% 
     summarize(#Element = .data$AUs[1],
       h_index = h_calc(.data$TC),
-      #h_index = which(1:length(.data$TC) >= sort(.data$TC,decreasing = T))[1]-1,
       g_index = g_calc(.data$TC),
       PY_start = min(.data$PY),
       TC = sum(.data$TC),

R/collabByRegionPlot.R

@@ -108,6 +108,7 @@ collabByRegionPlot <- function(
   n_regions <- length(regions)
 
   net <- list()
+
   for (i in regions){
     reg_co <- labelCo %>% 
       dplyr::filter(.data$continent %in% i) %>% 
@@ -119,11 +120,19 @@ collabByRegionPlot <- function(
                               label = label, labelsize = labelsize, label.cex = label.cex, label.color = label.color, label.n = label.n,
                               halo = halo, cluster = cluster, community.repulsion = community.repulsion, vos.path = NULL, size = size,
                               size.cex = size.cex, curved = curved, noloops = noloops, remove.multiple = remove.multiple, remove.isolates = remove.isolates,
-                              weighted = weighted, edgesize = edgesize, edges.min = edges.min, alpha = alpha, verbose = verbose)
-      if (verbose) plot(net[[i]]$graph)
-    }
-    net[[i]]$NetMatrix_reg <- NetMatrix_reg
+                              weighted = weighted, edgesize = edgesize, edges.min = edges.min, alpha = alpha, verbose = FALSE)
+      net[[i]]$NetMatrix_reg <- NetMatrix_reg
+      }
+    
   }
 
+  if (verbose){ 
+    l <- ceiling(length(net)/2)
+    par(mfrow=c(l,2))
+    # for (i in 1:length(net)){
+    #   plot(net[[i]]$graph)
+    # }
+    lapply(net, function(x){plot(x$graph)})
+  }
   return(net)
 }

R/summary.bibliometrix.R

@@ -42,13 +42,13 @@ summary.bibliometrix<-function(object, ...){
   options(width=130)
 
   arguments <- list(...)
-  if (sum(names(arguments)=="k")==0){k=10} else {k=arguments$k}
-  if (sum(names(arguments)=="pause")==0){pause=FALSE} else {pause=arguments$pause}
-  if (sum(names(arguments)=="width")==0){options(width=120)} else {options(width=arguments$width)}
-  if (sum(names(arguments)=="verbose")==0){verbose=TRUE} else {verbose=FALSE}
-  K=k
-  Co=NULL
-  AC=NULL
+  if (sum(names(arguments)=="k")==0){k=10} else {k <- arguments$k}
+  if (sum(names(arguments)=="pause")==0){pause <- FALSE} else {pause <- arguments$pause}
+  if (sum(names(arguments)=="width")==0){options(width = 120)} else {options(width = arguments$width)}
+  if (sum(names(arguments)=="verbose")==0){verbose <- TRUE} else {verbose <- FALSE}
+  K <- k
+  Co <- NULL
+  AC <- NULL
 
   TCm <- format(mean(as.numeric(object$TotalCitation), na.rm=TRUE),digits = 4)
   TCmy <- format(mean(as.numeric(object$MostCitedPapers$TCperYear), na.rm = TRUE), digits = 4)