From fe5b4dd48ab495149cae20bd80c3c7406fc18b1c Mon Sep 17 00:00:00 2001
From: Romain Franconville <romain.franconville@protonmail.com>
Date: Wed, 25 Mar 2020 11:21:37 -0400
Subject: [PATCH] Use the memoised version of neuprint_fetch where it makes
 sense

---
 R/connectivity.R | 4 ++--
 R/neurons.R      | 2 +-
 R/roi.R          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/R/connectivity.R b/R/connectivity.R
index d1dc78cf..dc349350 100644
--- a/R/connectivity.R
+++ b/R/connectivity.R
@@ -255,7 +255,7 @@ neuprint_common_connectivity <- function(bodyids, statuses = NULL,
                             find_inputs,
                             all_segments))
   class(Payload) = "json"
-  com.conn = neuprint_fetch(path = 'api/npexplorer/commonconnectivity', body = Payload, conn = conn, ...)
+  com.conn = neuprint_fetch_memo(path = 'api/npexplorer/commonconnectivity', body = Payload, conn = conn, ...)
   partnerType <- ifelse(prepost=="POST","output","input")
   partnerNames <- sapply(com.conn$data[[1]][[1]],function(d) d[[partnerType]])
   partnerCount <- table(partnerNames)
@@ -334,7 +334,7 @@ neuprint_simple_connectivity <- function(bodyids,
                             id2json(bodyids),
                             find_inputs))
   class(Payload) = "json"
-  simp.conn = neuprint_fetch(path = 'api/npexplorer/commonconnectivity', body = Payload, conn = conn, simplifyVector = TRUE, ...)
+  simp.conn = neuprint_fetch_memo(path = 'api/npexplorer/commonconnectivity', body = Payload, conn = conn, simplifyVector = TRUE, ...)
   if(!length(simp.conn$data)){
     return(NULL)
   }
diff --git a/R/neurons.R b/R/neurons.R
index 1b51514b..7c9ac3a9 100644
--- a/R/neurons.R
+++ b/R/neurons.R
@@ -213,7 +213,7 @@ neuprint_read_skeletons <- function(bodyids, dataset=NULL, conn=NULL, heal=TRUE,
     return(nl)
   }
   path=file.path("api/skeletons/skeleton", dataset, bodyids)
-  res=neuprint_fetch(path, conn=conn, simplifyVector = TRUE, include_headers = FALSE, ...)
+  res=neuprint_fetch_memo(path, conn=conn, simplifyVector = TRUE, include_headers = FALSE, ...)
   colnames(res$data)=c("PointNo","X","Y","Z","W","Parent")
   df=as.data.frame(res$data)
   # convert radius to diameter
diff --git a/R/roi.R b/R/roi.R
index 02e08c75..9a88b6d2 100644
--- a/R/roi.R
+++ b/R/roi.R
@@ -34,7 +34,7 @@ neuprint_find_neurons <- function(input_ROIs,
                             jsonlite::toJSON(output_ROIs),
                             all_segments))
   class(Payload) = "json"
-  found.neurons = neuprint_fetch(path = 'api/npexplorer/findneurons', body = Payload, conn = conn, ...)
+  found.neurons = neuprint_fetch_memo(path = 'api/npexplorer/findneurons', body = Payload, conn = conn, ...)
   columns = unlist(found.neurons[[1]])
   keep = !columns%in%c("roiInfo","rois")
   neurons = data.frame()
@@ -113,7 +113,7 @@ neuprint_ROI_connectivity <- function(rois, full=TRUE,
     results <-matrix(ifelse(statistic == 'count', 0L, 0),
                      nrow=length(rois), ncol=length(rois),
                      dimnames = list(inputs=rois,outputs=rois))
-    roi.conn = neuprint_fetch(path = 'api/cached/roiconnectivity', conn = conn, ...)
+    roi.conn = neuprint_fetch_memo(path = 'api/cached/roiconnectivity', conn = conn, ...)
     missing=setdiff(rois, unlist(roi.conn$roi_names))
     if(length(missing))
       warning("Dropping missing rois:", paste(missing, collapse = " "))
@@ -130,7 +130,7 @@ neuprint_ROI_connectivity <- function(rois, full=TRUE,
                             dataset,
                             ifelse(is.null(rois),jsonlite::toJSON(list()),jsonlite::toJSON(rois))))
     class(Payload) = "json"
-    roi.conn <- neuprint_fetch(path = 'api/npexplorer/roiconnectivity', body = Payload, conn = conn, ...)
+    roi.conn <- neuprint_fetch_memo(path = 'api/npexplorer/roiconnectivity', body = Payload, conn = conn, ...)
     ll <- neuprint_list2df(roi.conn)
     # running fromJSON on many separate strings is slow, so start by
     # selecting strings that actually contain the selected ROIs
@@ -190,7 +190,7 @@ neuprint_ROI_mesh <- function(roi, dataset = NULL, conn = NULL, ...){
   conn=neuprint_login(conn)
   dataset = check_dataset(dataset, conn=conn)
   roicheck = neuprint_check_roi(rois=roi, dataset = dataset, conn = conn, ...)
-  roiQuery = neuprint_fetch(path=paste("api/roimeshes/mesh", dataset, roi,
+  roiQuery = neuprint_fetch_memo(path=paste("api/roimeshes/mesh", dataset, roi,
                                        sep="/"),
                             parse.json = FALSE,
                             include_headers = FALSE)