Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java Fri Oct 24 04:47:42 2008 @@ -49,10 +49,6 @@ this.distances = distances; } - - /** - * [EMAIL PROTECTED] - */ public String getDescription() { return "Brute Force";
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java Fri Oct 24 04:47:42 2008 @@ -309,10 +309,6 @@ DISTANCES.put("Vienna", vienna); } - - /** - * [EMAIL PROTECTED] - */ public List<String> getKnownCities() { List<String> cities = new ArrayList<String>(DISTANCES.keySet()); @@ -320,10 +316,6 @@ return cities; } - - /** - * [EMAIL PROTECTED] - */ public int getDistance(String startingCity, String destinationCity) { return DISTANCES.get(startingCity).get(destinationCity); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java Fri Oct 24 04:47:42 2008 @@ -108,9 +108,6 @@ this.mahout = mahout; } - /** - * [EMAIL PROTECTED] - */ public String getDescription() { String selectionName = selectionStrategy.getClass().getSimpleName(); return (mahout ? "Mahout " : "") + "Evolution (pop: " + populationSize Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java Fri Oct 24 04:47:42 2008 @@ -37,7 +37,6 @@ * The original code is from <b>the Watchmaker project</b> * (https://watchmaker.dev.java.net/). */ [EMAIL PROTECTED]("serial") final class ExecutionPanel extends JPanel implements ProgressListener { private final JButton startButton; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java Fri Oct 24 04:47:42 2008 @@ -39,7 +39,6 @@ * The original code is from <b>the Watchmaker project</b> * (https://watchmaker.dev.java.net/). */ [EMAIL PROTECTED]("serial") final class ItineraryPanel extends JPanel { private final Collection<JCheckBox> checkBoxes; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java Fri Oct 24 04:47:42 2008 @@ -55,7 +55,6 @@ * The <code>EvolutionPanel</code> has been modified to add a "distributed * (mahout)" JCheckBox. */ [EMAIL PROTECTED]("serial") final class StrategyPanel extends JPanel { private final DistanceLookup distances; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java Fri Oct 24 04:47:42 2008 @@ -41,7 +41,6 @@ * This class has been modified to add a main function that runs the JApplet * inside a JDialog. */ [EMAIL PROTECTED]("serial") public final class TravellingSalesman extends JApplet { private final ItineraryPanel itineraryPanel; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java Fri Oct 24 04:47:42 2008 @@ -31,7 +31,7 @@ int n = 100; Random rng = new MersenneTwisterRNG(); int tp, tn, fp, fn; - float se, sp; + double se, sp; for (int nloop = 0; nloop < n; nloop++) { tp = rng.nextInt(1000); @@ -40,8 +40,8 @@ fn = rng.nextInt(1000); CDFitness fitness = new CDFitness(tp, fp, tn, fn); - se = (float) tp / (tp + fn); - sp = (float) tn / (tn + fp); + se = ((double) tp) / (tp + fn); + sp = ((double) tn) / (tn + fp); assertEquals(se * sp, fitness.get()); } Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java Fri Oct 24 04:47:42 2008 @@ -50,7 +50,7 @@ double range = rng.nextDouble(); int k = rng.nextInt(1000); CDMutation mutation = new CDMutation(1.0, range, k); - CDRule rule = new CDRule(0f, rng); + CDRule rule = new CDRule(0.0, rng); CDRule mutated = mutation.mutate(new CDRule(rule), rng); Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java Fri Oct 24 04:47:42 2008 @@ -36,7 +36,7 @@ */ public void testRandomCDRule() { DataSet dataset = DataSet.getDataSet(); - double threshold = 0f; + double threshold = 0.0; int n = 100; for (int nloop = 0; nloop < n; nloop++) { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java Fri Oct 24 04:47:42 2008 @@ -44,12 +44,11 @@ rng = new MersenneTwisterRNG(); } - private Descriptors randomDescriptors(int nbattributes, float numRate, - float catRate) { + private Descriptors randomDescriptors(int nbattributes, double numRate, double catRate) { char[] descriptors = new char[nbattributes]; - float rnd; + double rnd; for (int index = 0; index < nbattributes; index++) { - rnd = rng.nextFloat(); + rnd = rng.nextDouble(); if (rnd < numRate) { // numerical attribute descriptors[index] = 'N'; @@ -68,18 +67,17 @@ private Object[][] randomDescriptions(Descriptors descriptors) { int nbattrs = descriptors.size(); Object[][] descriptions = new Object[nbattrs][]; - double min, max; for (int index = 0; index < nbattrs; index++) { if (descriptors.isNumerical(index)) { // numerical attribute - descriptions[index] = new Object[2]; - min = rng.nextDouble() * (Float.MAX_VALUE - Float.MIN_VALUE) - + Float.MIN_VALUE; - max = rng.nextDouble() * (Float.MAX_VALUE - min) + min; - descriptions[index][0] = (float) min; - descriptions[index][1] = (float) max; + // srowen: I 'fixed' this to not use Double.{MAX,MIN}_VALUE since + // it does not seem like that has the desired effect + double min = rng.nextDouble() * ((long) Integer.MAX_VALUE - Integer.MIN_VALUE) + Integer.MIN_VALUE; + double max = rng.nextDouble() * (Integer.MAX_VALUE - min) + min; + + descriptions[index] = new Double[] { min, max }; } else if (descriptors.isNominal(index)) { // categorical attribute int nbvalues = rng.nextInt(50) + 1; @@ -119,9 +117,9 @@ for (int index = 0; index < descriptors.size(); index++) { if (descriptors.isNumerical(index)) { // numerical attribute - float min = (Float) descriptions[index][0]; - float max = (Float) descriptions[index][1]; - float value = rng.nextFloat() * (max - min) + min; + double min = (Double) descriptions[index][0]; + double max = (Double) descriptions[index][1]; + double value = rng.nextDouble() * (max - min) + min; buffer.append(value); } else if (descriptors.isNominal(index)) { @@ -158,8 +156,8 @@ int nbattrs = rng.nextInt(maxattr) + 1; // random descriptors - float numRate = rng.nextFloat(); - float catRate = rng.nextFloat() * (1f - numRate); + double numRate = rng.nextDouble(); + double catRate = rng.nextDouble() * (1.0 - numRate); Descriptors descriptors = randomDescriptors(nbattrs, numRate, catRate); // random descriptions @@ -192,8 +190,8 @@ if (descriptors.isNumerical(index)) { // numerical attribute - float min = (Float) descriptions[index][0]; - float max = (Float) descriptions[index][1]; + double min = (Double) descriptions[index][0]; + double max = (Double) descriptions[index][1]; Range range = DescriptionUtils.extractNumericalRange(description); assertTrue("bad min value for attribute (" + index + ")", Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java Fri Oct 24 04:47:42 2008 @@ -35,9 +35,7 @@ } public void testCreateNumericalDescription() { - String description = DescriptionUtils.createNumericalDescription(-5.1f, - 12.32f); - + String description = DescriptionUtils.createNumericalDescription(-5.1, 12.32); assertEquals("-5.1,12.32", description); } @@ -58,8 +56,8 @@ Range range = DescriptionUtils.extractNumericalRange(description); - assertEquals(-2.06f, range.min); - assertEquals(12.32f, range.max); + assertEquals(-2.06, range.min); + assertEquals(12.32, range.max); } } Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java?rev=707606&r1=707605&r2=707606&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java Fri Oct 24 04:47:42 2008 @@ -57,11 +57,11 @@ * Generate a new dataset. * * @param numRate numerical attributes rate.<br> - * 0f : all attributes are categorical<br> - * 1f : all attributes are numerical<br> + * 0.0 : all attributes are categorical<br> + * 1.0 : all attributes are numerical<br> * otherwise : both numerical an categorical attributes are probable */ - public void randomDataset(float numRate) { + public void randomDataset(double numRate) { reset(dataset); int nba = rng.nextInt(maxnba) + 1; @@ -89,21 +89,21 @@ * categorical. */ public void randomDataset() { - randomDataset(0.5f); + randomDataset(0.5); } /** * Generate a new dataset. All the attributes are numerical. */ public void numericalDataset() { - randomDataset(1f); + randomDataset(1.0); } /** * Generate a new dataset. All the attributes are categorical. */ public void categoricalDataset() { - randomDataset(0f); + randomDataset(0.0); } /** @@ -116,9 +116,11 @@ } private void prepareNumericalAttribute(int index) { - double max = rng.nextDouble() * (Float.MAX_VALUE - Float.MIN_VALUE) - + Float.MIN_VALUE; - double min = rng.nextDouble() * (max - Float.MIN_VALUE) + Float.MIN_VALUE; + + // srowen: I 'fixed' this to not use Double.{MAX,MIN}_VALUE since + // it does not seem like that has the desired effect + double max = rng.nextDouble() * ((long) Integer.MAX_VALUE - Integer.MIN_VALUE) + Integer.MIN_VALUE; + double min = rng.nextDouble() * (max - Integer.MIN_VALUE) + Integer.MIN_VALUE; expect(dataset.isNumerical(index)).andReturn(true).anyTimes(); expect(dataset.getMax(index)).andReturn(max).anyTimes();
