projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
antipro pour matrix
[iramuteq]
/
Rscripts
/
afc_graph.R
diff --git
a/Rscripts/afc_graph.R
b/Rscripts/afc_graph.R
index
8233d8f
..
f611cc6
100644
(file)
--- a/
Rscripts/afc_graph.R
+++ b/
Rscripts/afc_graph.R
@@
-80,7
+80,7
@@
if ( qui == 3 ) {
if (exists('afctable')) {
eff <- rowSums(afctable)
} else {
if (exists('afctable')) {
eff <- rowSums(afctable)
} else {
- eff <- afc
table
$rowmass
+ eff <- afc$rowmass
}
if (!is.null(debsup)) {
}
if (!is.null(debsup)) {
@@
-95,9
+95,10
@@
if ( qui == 3 ) {
cex.par <- eff[debsup:(debet-1)]
}
if ( qui == 2 ) {
cex.par <- eff[debsup:(debet-1)]
}
if ( qui == 2 ) {
+ fin <- nrow(table.in)
table.in <- table.in[debet:nrow(table.in),]
tablechi <- tablechi[debet:nrow(tablechi),]
table.in <- table.in[debet:nrow(table.in),]
tablechi <- tablechi[debet:nrow(tablechi),]
- cex.par <- eff[debet:
nrow(afctable)
]
+ cex.par <- eff[debet:
fin
]
}
}
}
}
@@
-111,9
+112,10
@@
if ( qui == 3 ) {
cex.par <- eff
}
} else {
cex.par <- eff
}
} else {
+ fin <- nrow(table.in)
table.in <- table.in[debet:nrow(table.in),]
tablechi <- tablechi[debet:nrow(tablechi),]
table.in <- table.in[debet:nrow(table.in),]
tablechi <- tablechi[debet:nrow(tablechi),]
- cex.par <- eff[debet:
nrow(afctable)
]
+ cex.par <- eff[debet:
fin
]
}
}
}
}
@@
-175,7
+177,12
@@
if (typegraph == 0) {
table.in <- table.in[order(cex.par, decreasing = TRUE),]
classes <- classes[order(cex.par, decreasing = TRUE)]
cex.par <- cex.par[order(cex.par, decreasing = TRUE)]
table.in <- table.in[order(cex.par, decreasing = TRUE),]
classes <- classes[order(cex.par, decreasing = TRUE)]
cex.par <- cex.par[order(cex.par, decreasing = TRUE)]
- table.in <- stopoverlap(table.in, cex.par=cex.par, xlim = xminmax, ylim = yminmax)
+ table.out <- stopoverlap(table.in, cex.par=cex.par, xlim = xminmax, ylim = yminmax)
+ table.in <- table.out$toplot
+ notplot <- table.out$notplot
+ if (! is.null(notplot)) {
+ write.csv2(notplot, file = paste(fileout,'_notplotted.csv', sep=''))
+ }
classes <- classes[table.in[,4]]
cex.par <- cex.par[table.in[,4]]
}
classes <- classes[table.in[,4]]
cex.par <- cex.par[table.in[,4]]
}
@@
-187,9
+194,11
@@
if (typegraph == 0) {
rain = rainbow(clnb)
colors = rain[classes]
#rn <- rownames(table.in)
rain = rainbow(clnb)
colors = rain[classes]
#rn <- rownames(table.in)
- rgl.open()
+ #rgl.open()
+
text3d(table.in[,1], table.in[,2], table.in[,3], rn, col = colors , cex = cex.par)
rgl.bg(col = c('white', "#99bb99"), front = "lines", box=FALSE, sphere = TRUE)
text3d(table.in[,1], table.in[,2], table.in[,3], rn, col = colors , cex = cex.par)
rgl.bg(col = c('white', "#99bb99"), front = "lines", box=FALSE, sphere = TRUE)
+ par3d('userMatrix' = matrix(c(1,0,0,0, 0,1,0,0,0,0,1,0,0,0,0,1), ncol=4, nrow = 4))
par3d(cex=0.7)
#par3d(windowRect = c(100,100,600,600))
rgl.lines(c(rx), c(0, 0), c(0, 0), col = "#000000")
par3d(cex=0.7)
#par3d(windowRect = c(100,100,600,600))
rgl.lines(c(rx), c(0, 0), c(0, 0), col = "#000000")