Got R and python code working

ben18785 · Dec 3, 2018 · 68b5c20 · 68b5c20
1 parent 7a63b83
commit 68b5c20
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/App-1/code_python.R b/App-1/code_python.R
@@ -1,18 +1,22 @@
+fPrismPython <- function(text){
+  return(prismCodeBlock(text, language = "python"))
+}
+
 fPythoncode <- function(input){
   if(input$dist=="Normal"){
     if(input$property=="pdf")
-      fMakeFunction(mainName="scipy.stats.norm.pdf",
+      fPrismPython(fMakeFunctionPaste(mainName="scipy.stats.norm.pdf",
                     params=c(input$mu,input$sigma),
-                    prefixparams="x")
+                    prefixparams="x"))
     else if(input$property=="log_pdf")
-      fMakeFunction(mainName="scipy.stats.norm.logpdf",
+      fPrismPython(fMakeFunctionPaste(mainName="scipy.stats.norm.logpdf",
                     params=c(input$mu,input$sigma),
-                    prefixparams="x")
+                    prefixparams="x"))
     else if(input$property=="random")
-      fMakeFunction(mainName="numpy.random.normal",
+      fPrismPython(fMakeFunctionPaste(mainName="numpy.random.normal",
                     import="import numpy",
                     params=c(input$mu,input$sigma),
-                    postfixparams="n")
+                    postfixparams="n"))
   }else if(input$dist=="Uniform"){
     if(input$property=="pdf")
       HTML(markdown::markdownToHTML(text="```{python}

diff --git a/App-1/code_r.R b/App-1/code_r.R
@@ -10,12 +10,12 @@ fRcode <- function(input){
                                         params=c(input$mu,input$sigma),
                                         prefixparams="x"))
     else if(input$property=="log_pdf")
-      fPrismR(fMakeFunction(mainName="dnorm",
+      fPrismR(fMakeFunctionPaste(mainName="dnorm",
                     params=c(input$mu,input$sigma),
                     prefixparams="x",
                     postfixparams="log=TRUE"))
     else if(input$property=="random")
-      fPrismR(fMakeFunction(mainName="rnorm",
+      fPrismR(fMakeFunctionPaste(mainName="rnorm",
                     params=c(input$mu,input$sigma),
                     prefixparams="n"))
   }else if(input$dist=="Uniform"){

diff --git a/App-1/functions.R b/App-1/functions.R
@@ -150,7 +150,7 @@ fMakeFunctionPaste <- function(mainName, params, prefixparams=NULL,postfixparams
     if(is.null(import))
       lWords <- words
     else
-      lWords <- list(import, words)
+      lWords <- paste(import, words, sep="\n")
   }else{
     lWords <- mainName
   }