Author: echatellier Date: 2013-11-21 22:33:12 +0100 (Thu, 21 Nov 2013) New Revision: 3839 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3839 Log: Manage uniform distributions (MM et PC) Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-21 21:15:38 UTC (rev 3838) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-21 21:33:12 UTC (rev 3839) @@ -94,7 +94,6 @@ String bsup = ""; for (int i = 0; i < factorNumber; i++) { Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) factor.getDomain(); if (i != 0) { factorNames += ","; levels += ","; @@ -109,10 +108,8 @@ gridJump += factor.getCardinality() / 2; - //binf += domain.getCalculatorMinBound(); - binf+=0; - bsup+=0; - //bsup += domain.getCalculatorMaxBound(); + binf+= getMinBound(factor); + bsup+= getMaxBound(factor); } String rInstruction = "a<-morris(model=NULL,factors=c(%s),r=%s," +