Fixed bug in shinyapps.io implementation of need() on population size

cjbattey · cjbattey · commit eaf26d9d19e7 · 2017-03-02T13:38:47.000-08:00
diff --git a/driftR.Rproj b/driftR.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
diff --git a/server.R b/server.R
@@ -13,7 +13,7 @@ shinyServer(function(input,output,session){
       need((input$nPop==length(p())|length(p())==1),"number of populations must equal number of starting allele frequencies."),
       need(input$gen<5001,"Please select < 5000 generations."),
       need(input$nPop<101,"Please select < 100 populations"),
-      need(input$n<1000001,"Please select n < 1,000,000"),
+      #need(input$n<1000001,"Please select n < 1,000,000"),
       need(input$plotStats!="","Select a variable to plot.")
       )
     tmp <- runPopSim(gen=input$gen,p=p(),Waa=input$Waa,Wab=input$Wab,Wbb=input$Wbb,n=n(),

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ shinyServer(function(input,output,session){`
`13`	`13`	`need((input$nPop==length(p())\|length(p())==1),"number of populations must equal number of starting allele frequencies."),`
`14`	`14`	`need(input$gen<5001,"Please select < 5000 generations."),`
`15`	`15`	`need(input$nPop<101,"Please select < 100 populations"),`
`16`		`- need(input$n<1000001,"Please select n < 1,000,000"),`
	`16`	`+ #need(input$n<1000001,"Please select n < 1,000,000"),`
`17`	`17`	`need(input$plotStats!="","Select a variable to plot.")`
`18`	`18`	`)`
`19`	`19`	`tmp <- runPopSim(gen=input$gen,p=p(),Waa=input$Waa,Wab=input$Wab,Wbb=input$Wbb,n=n(),`