max/ourMELONS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Waldir Leoncio 2021-02-15 11:31:04 +01:00
parent f243ee0466
commit 4a7eef74bc
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
R/indMix.R
View file

@ -28,11 +28,7 @@ indMix <- function(c, npops, dispText) {
ready <- FALSE
teksti <- 'Input upper bound to the number of populations (possibly multiple values)' # TODO: add "likely ncol(Z) values"?
while (!ready) {
npopstextExtra <- inputdlg(
teksti,
1,
'20'
)
npopstextExtra <- inputdlg(teksti, 1, '20')
if (isempty(npopstextExtra)) { # Painettu Cancel:ia
return()
}
@ -160,6 +156,7 @@ indMix <- function(c, npops, dispText) {
}
if (i1 != i2 & maxMuutos > 1e-5) {
# browser() # TEMP
# Tapahtui muutos
muutoksia <- 1
if (muutosNyt == 0) {
@ -513,7 +510,8 @@ indMix <- function(c, npops, dispText) {
}
}
# FIXME: muutoksia is never 0, so vaihe never equals 5 and ready 1
print(paste("i1 =", i1, "i2 =", i2, "maxMuutos =", maxMuutos))#TEMP
if (muutoksia == 0) {
if (vaihe <= 4) {
vaihe <= vaihe + 1