提交: 9df1ef9d4cbf6a6a1a4cf96e130b8218a644df2f - myprojects-hg-reborn (hg)

Commit MetaInfo

• 修订版: 9df1ef9d4cbf6a6a1a4cf96e130b8218a644df2f (tree)
• 时间: 2022-04-26 03:29:55
• 作者: Lorenzo Isella <lorenzo.isella@gmai...>
• Commiter: Lorenzo Isella

Log Message

Now the fragments are sorted in decreasing order.

更改概述

• modified: R-codes/read_plot_aggregate_shiny.R

差异

diff -r f610d2243c4f -r 9df1ef9d4cbf R-codes/read_plot_aggregate_shiny.R
--- a/R-codes/read_plot_aggregate_shiny.R	Mon Apr 25 19:35:26 2022 +0200
+++ b/R-codes/read_plot_aggregate_shiny.R	Mon Apr 25 20:29:55 2022 +0200
@@ -14,7 +14,7 @@
 
 ## rm(tt)
 
-generate_two_fragments2 <- function(g){
+generate_two_fragments2 <- function(g, new_order){
 
     n_edges <- length(E(g))
     link_rem <- seq(n_edges)
@@ -26,6 +26,9 @@
         agg_list[[i]] <- g2
         
      }
+
+    agg_list <- agg_list[new_order]
+
     
     return(agg_list)
 
@@ -72,6 +75,8 @@
     link_rem <- seq(n_edges)
     agg_list1 <- list()
     agg_list2 <- list()
+
+    ll <- rep(-1, n_edges)
     
     for (i in link_rem){
         g2 <- delete.edges(g, E(g)[i])
@@ -85,6 +90,7 @@
             agg1 <- agg[mm==1,]
             agg2 <- agg[mm==2,]
 
+        ll[i] <- nrow(agg1)
             ## print(agg1)
             ## print(agg2)
 
@@ -93,9 +99,14 @@
         agg_list1[[i]] <- agg1
         agg_list2[[i]] <- agg2
 
-     }
+    }
+
+    ss <- sort(ll, index.return=T)$ix
     
-    return(list("agg1"=agg_list1, "agg2"=agg_list2))
+    agg_list1 <- agg_list1[ss]
+    agg_list2 <- agg_list2[ss]
+    
+    return(list("agg1"=agg_list1, "agg2"=agg_list2, "myorder"=ss))
 
 }
 
@@ -816,6 +827,8 @@
 })
 
 
+    order_frag <- reactive({chunks()$myorder})
+    
     chunk1 <- reactive({
         chunks()$agg1[[as.numeric(input$choose_event)]]
     })
@@ -824,7 +837,7 @@
         chunks()$agg2[[as.numeric(input$choose_event)]]
     })
 
-fragment_inventory <-  reactive({generate_two_fragments2(g())})
+fragment_inventory <-  reactive({generate_two_fragments2(g(), order_frag())})
 ## col_list <- reactive({fragment_membership(g)})
 
 g_new <- reactive({fragment_inventory()[[as.numeric(input$choose_event)]]})