diff --git a/R/AlterStructure.R b/R/AlterStructure.R index 278529d..3554b2e 100644 --- a/R/AlterStructure.R +++ b/R/AlterStructure.R @@ -215,7 +215,7 @@ ExtendLeaves <- function(X, TargetPG$NodePositions <- rbind(TargetPG$NodePositions, NNPos) TargetPG$Edges$Edges <- rbind(TargetPG$Edges$Edges, NEdgs) TargetPG$Edges$Lambdas <- c(TargetPG$Edges$Lambdas, rep(NA, nrow(NEdgs))) - TargetPG$Edges$Mus <- c(TargetPG$Edges$Lambdas, rep(NA, nrow(NEdgs))) + TargetPG$Edges$Mus <- c(TargetPG$Edges$Mus, rep(NA, nrow(NEdgs))) if(PlotSelected){ @@ -360,7 +360,7 @@ CollapseBrances <- function(X, if(all(ProjStruct$Edges[WorkingEdg, ] == NodeNames[(i-1):i])){ Reverse <- FALSE } else { - Reverse <- FALSE + Reverse <- TRUE } # Counting points at the begining @@ -711,7 +711,7 @@ ShiftBranching <- function(X, if(is.null(BrIds)){ BrIds <- BrPoints } else { - BrIds <- intersect(BrIds, BrIds) + BrIds <- intersect(BrIds, BrPoints) } PD <- ElPiGraph.R::PartitionData(X = X, NodePositions = TargetPG$NodePositions, diff --git a/R/grammar_operations.R b/R/grammar_operations.R index 61e50a4..020f586 100644 --- a/R/grammar_operations.R +++ b/R/grammar_operations.R @@ -25,8 +25,8 @@ f_reattach_edges <- function(ElasticMatrix, NodeNumber1, NodeNumber2) { ElasticMatrix2[NodeNumber1,] <- apply(rbind(lm[NodeNumber1,],lm[NodeNumber2,]), 2, max) ElasticMatrix2[,NodeNumber1] <- apply(rbind(lm[,NodeNumber1],lm[,NodeNumber2]), 2, max) - ElasticMatrix2[NodeNumber1,NodeNumber1] <- - ElasticMatrix[NodeNumber1,NodeNumber1]+ElasticMatrix[NodeNumber2,NodeNumber2]/2 + ElasticMatrix2[NodeNumber1,NodeNumber1] <-( + ElasticMatrix[NodeNumber1,NodeNumber1]+ElasticMatrix[NodeNumber2,NodeNumber2])/2 return(list(ElasticMatrix = ElasticMatrix2)) @@ -348,7 +348,7 @@ BisectEdge <- function(NodePositions, mu2 = ElasticMatrix[Edges[i,2],Edges[i,2]] if (mu1 > 0 & mu2 > 0){ - em[nn,nn] <- mean(mu1,mu2) + em[nn,nn] <- mean(c(mu1,mu2)) } else{ em[nn,nn] <- max(mu1,mu2) } @@ -475,7 +475,7 @@ ShrinkEdge <- function(NodePositions, k=1 for(i in 1:nrow(Edges)){ if((Connectivities[Edges[i,1]]>1 & Connectivities[Edges[i,2]]>1) - & (Connectivities[Edges[i,1]]>=Min_K | Connectivities[Edges[i,1]]>=Min_K)){ + & (Connectivities[Edges[i,1]]>=Min_K | Connectivities[Edges[i,2]]>=Min_K)){ tAdjustVect <- AdjustVect em <- f_reattach_edges(ElasticMatrix,Edges[i,1],Edges[i,2]) diff --git a/R/reporting.R b/R/reporting.R index 50108ee..548853c 100644 --- a/R/reporting.R +++ b/R/reporting.R @@ -19,7 +19,7 @@ getPrimitiveGraphStructureBarCode <- function(ElasticMatrix) { if(Mcon <= 2){ barcode <- paste0('0',barcode) } else { - barcode <- paste0(paste(rev(N[names(N)>=3]), collapse = '|'), barcode) + barcode <- paste0(paste(rev(N[as.integer(names(N))>=3]), collapse = '|'), barcode) } return(barcode)