From noreply at r-forge.r-project.org Wed May 15 11:46:01 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 15 May 2013 11:46:01 +0200 (CEST) Subject: [Rcolony-commits] r94 - pkg/R Message-ID: <20130515094601.66AD01855B5@r-forge.r-project.org> Author: jonesor Date: 2013-05-15 11:46:01 +0200 (Wed, 15 May 2013) New Revision: 94 Modified: pkg/R/build.colony.input.R Log: Fixed bug reported by Michelle DiLeo where the build.colony.input gives the wrong mating system in the Projectinformation.txt file Modified: pkg/R/build.colony.input.R =================================================================== --- pkg/R/build.colony.input.R 2013-01-21 14:06:49 UTC (rev 93) +++ pkg/R/build.colony.input.R 2013-05-15 09:46:01 UTC (rev 94) @@ -1029,8 +1029,8 @@ "Number of known maternal sibships : ", colonyfile$n.maternal.sibs.or.maternities, "\n", "Number of offspring with excluded fathers : ", colonyfile$n.excluded.paternities, "\n", "Number of offspring with excluded mothers : ", colonyfile$n.excluded.maternities, "\n", - "Male mating system : ", if(colonyfile$malepolygamy == 1){"Polygamous"}else{"Monogamous"}, "\n", - "Female mating system : ", if(colonyfile$femalepolygamy == 1){"Polygamous"}else{"Monogamous"}, "\n", + "Male mating system : ", if(colonyfile$malepolygamy == 0){"Polygamous"}else{"Monogamous"}, "\n", + "Female mating system : ", if(colonyfile$femalepolygamy == 0){"Polygamous"}else{"Monogamous"}, "\n", "Dioecious/Monoecious : ", if(colonyfile$diomonoecy == 1){"Monoecious"}else{"Dioecious"}, "\n", "Number of threads : ", "nA", "\n", "Number of Excluded Paternal Sibships : ", colonyfile$n.excluded.paternal.sibships, "\n",