Add files via upload

methods.R

@@ -1,6 +1,6 @@
 options(stringsAsFactors=FALSE)
 
-cmp_files=function(A, B, A_i, B_i, my_taxonomic_group, my_measure, output){
+cmp_files=function(A, B, A_i, B_i, my_taxonomic_group, my_measure, my_normalization, output){
 	print(c("::cmp_files"))
 	print(c("::my_taxonomic_group",my_taxonomic_group))
 	print(A_i)
@@ -41,15 +41,17 @@ cmp_files=function(A, B, A_i, B_i, my_taxonomic_group, my_measure, output){
 		T2=c(T2,cur_tax_group)
 	}
 
-	for(x in 2:(dim(d2)[2]-1)){
-		tot_sum=sum(d2[,x])
-		d2[,x]=100*d2[,x]/tot_sum
-	}
-	for(x in 2:(dim(d1)[2]-1)){
-		tot_sum=sum(d1[,x])
-		d1[,x]=100*d1[,x]/tot_sum
-	}
-
+	print(c("my_normalization",my_normalization))
+	if(my_normalization=="relative frequency"){
+		for(x in 2:(dim(d2)[2]-1)){
+			tot_sum=sum(d2[,x])
+			d2[,x]=100*d2[,x]/tot_sum
+		}
+		for(x in 2:(dim(d1)[2]-1)){
+			tot_sum=sum(d1[,x])
+			d1[,x]=100*d1[,x]/tot_sum
+		}
+	}	
 
 
 	cn1=colnames(d1)

server.R

@@ -56,6 +56,14 @@ server <- function(input, output, session)
 		v$measure=input$measure
 	})	
 
+	#	----------------------------------------------
+	#	Normalization
+	#	----------------------------------------------
+	observeEvent(input$normalization,{
+		source("methods.R")
+		v$normalization=input$normalization
+	})	
+
 	#	----------------------------------------------
 	#	Go Button
 	#	----------------------------------------------
@@ -64,7 +72,7 @@ server <- function(input, output, session)
 		print(paste0("file1::",input$file1))
 		print(paste0("file2::",input$file2))
 
-		cmp_files(input$file1$datapath,input$file2$datapath,input$sfile1,input$sfile2,input$species, input$measure, output)
+		cmp_files(input$file1$datapath,input$file2$datapath,input$sfile1,input$sfile2,input$species, input$measure, input$normalization, output)
 
 
 

ui.R

@@ -1,4 +1,8 @@
 library(shiny)
+library(shinyalert)
+library(shinyBS)
+library(shinyjs)
+library(shinythemes)
 
 options(stringsAsFactors=FALSE)
 options(stringsAsFactors=FALSE)
@@ -52,6 +56,7 @@ body, label, input, button, select {
 			selectInput("sfile2", multiple = TRUE, label="",choices = list(""), selected = 1),
 			selectInput("species", label="Taxonomic groups",choices = list("kingdom","phylum","class","order","family","genus","species"), selected = 1),
 			selectInput("measure", label="Maßzahl",choices = list("mean","median","sum"), selected = 1),
+			selectInput("normalization", label="Normalization",choices = list("raw values","relative frequency"), selected = 1),
 			actionButton("goButton", "Analyse dataset!")))),
 		mainPanel(
 			useShinyjs(),