From f06d8e72d3aa77b829ccfa9b8fbf5c85135e165b Mon Sep 17 00:00:00 2001 From: Tom Copeland Date: Wed, 11 Sep 2002 18:19:26 +0000 Subject: [PATCH] fixed throwing away results bug, tweaked TileExpander blocking interval git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@913 51baf565-9d33-0410-a72c-fc3788e3496d --- .../src/net/sourceforge/pmd/dcpd/DCPD.java | 2 +- .../sourceforge/pmd/dcpd/DCPDResultsImpl.java | 34 ++++--------------- .../src/net/sourceforge/pmd/dcpd/DGST.java | 25 ++------------ .../pmd/dcpd/JobAddedListener.java | 2 +- .../sourceforge/pmd/dcpd/TileExpander.java | 2 +- .../sourceforge/pmd/dcpd/TileHarvester.java | 3 ++ .../net/sourceforge/pmd/dcpd/TilePlanter.java | 2 +- .../src/net/sourceforge/pmd/dcpd/Util.java | 3 +- 8 files changed, 17 insertions(+), 56 deletions(-) diff --git a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPD.java b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPD.java index 10910fee97..7b2c206cf4 100644 --- a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPD.java +++ b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPD.java @@ -36,7 +36,7 @@ public class DCPD { System.out.println("Tokenizing"); job = new Job("java_lang", new Integer(1)); - tokenSetWrapper = new TokenSetsWrapper(loadTokens("C:\\j2sdk1.4.0_01\\src\\java\\lang\\ref", true), job.id); + tokenSetWrapper = new TokenSetsWrapper(loadTokens("C:\\j2sdk1.4.0_01\\src\\java\\lang\\ref\\", true), job.id); System.out.println("Tokenizing complete, " + (System.currentTimeMillis()-start) + " elapsed ms"); System.out.println("Writing the TokenSetsWrapper to the space"); diff --git a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPDResultsImpl.java b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPDResultsImpl.java index ea2b52237d..6296fda116 100644 --- a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPDResultsImpl.java +++ b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPDResultsImpl.java @@ -17,10 +17,15 @@ public class DCPDResultsImpl extends TileOccurrences implements Results, Seriali public void addTile(Tile tile, TokenEntry tok) { super.addTile(tile, tok); +/* for (int i=orderedTiles.size()-1; i>=0; i--) { Tile candidate = (Tile)orderedTiles.get(i); removeDupesOf(candidate); } +*/ + if (orderedTiles.size() > 1) { + removeDupesOf((Tile)orderedTiles.get(orderedTiles.size()-1)); + } } public int getTileLineCount(Tile tile, TokenSets tokenSets) { @@ -43,37 +48,12 @@ public class DCPDResultsImpl extends TileOccurrences implements Results, Seriali if (smallTileToken.getBeginLine() == largeTileToken.getBeginLine() && smallTileToken.getImage().equals(largeTileToken.getImage()) && smallTileToken.getTokenSrcID().equals(largeTileToken.getTokenSrcID())) { - super.orderedTiles.remove(smallerTile); - super.tileToOccurrenceMap.remove(smallerTile); + orderedTiles.remove(smallerTile); + tileToOccurrenceMap.remove(smallerTile); break outer; } } } } } - -/* - private void removeDupesOf(Tile tile) { - Set occs = new HashSet(); - occs.addAll((List)tileToOccurrenceMap.get(tile)); - for (Iterator i = tileToOccurrenceMap.keySet().iterator(); i.hasNext();) { - Tile tile2 = (Tile)i.next(); - - if (tile2.equals(tile)) { - continue; - } - - Set possibleDupe = new HashSet(); - possibleDupe.addAll((List)tileToOccurrenceMap.get(tile2)); - possibleDupe.removeAll(occs); - if (possibleDupe.isEmpty()) { - System.out.println("Removing dupe " + tile.getImage()); - tileToOccurrenceMap.remove(tile); - orderedTiles.remove(tile); - break; - } - } - - } -*/ } diff --git a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DGST.java b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DGST.java index a893c2550f..f72c74db87 100644 --- a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DGST.java +++ b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/DGST.java @@ -49,7 +49,7 @@ public class DGST { occ = tg.harvest(occ.size()); addToResults(occ); if (!occ.isEmpty()) { - System.out.println("**Season complete" + System.getProperty("line.separator") + "->Tile count: " + occ.size() + System.getProperty("line.separator") + "->Tile size: " + ((Tile)(occ.getTiles().next())).getTokenCount() + System.getProperty("line.separator") + "->First tile image: " + ((Tile)(occ.getTiles().next())).getImage()); + System.out.println("**Season complete" + System.getProperty("line.separator") + "->Tile count: " + occ.size() + System.getProperty("line.separator") + "->Tile size: " + ((Tile)(occ.getTiles().next())).getTokenCount()); } TilePlanter scatterer = new TilePlanter(space, job); scatterer.scatter(occ); @@ -61,31 +61,10 @@ public class DGST { Tile tile = (Tile)i.next(); if (tile.getTokenCount() >= minimumTileSize) { for (Iterator j = occ.getOccurrences(tile); j.hasNext();) { - TokenEntry te = (TokenEntry)j.next(); - results.addTile(tile, te); + results.addTile(tile, (TokenEntry)j.next()); } } } } -/* - private boolean isDuplicate(Tile candidate) { - for (Iterator j = results.getTiles(); j.hasNext();) { - Tile tile = (Tile)j.next(); - for (int i=0;i0 && i % 100 == 0) { + System.out.println("Harvested " + i + " batches so far"); + } } return occ; } diff --git a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/TilePlanter.java b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/TilePlanter.java index 94656879b2..2fd2321649 100644 --- a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/TilePlanter.java +++ b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/TilePlanter.java @@ -38,7 +38,7 @@ public class TilePlanter { //System.out.println("Scattering " + tw.tile.getImage() + "->" + tw.occurrences.size()); tilesSoFar++; if (tilesSoFar % 100 == 0) { - System.out.println("Written " + tilesSoFar + " tiles so far"); + System.out.println("Planted " + tilesSoFar + " batches so far"); } } } diff --git a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/Util.java b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/Util.java index bcd7f1c2a1..a2a1250216 100644 --- a/pmd-dcpd/src/net/sourceforge/pmd/dcpd/Util.java +++ b/pmd-dcpd/src/net/sourceforge/pmd/dcpd/Util.java @@ -39,8 +39,7 @@ public class Util { if (objectCount % 100 == 0) { System.out.println(objectCount + " objects taken so far"); } - System.out.println("took " + e); - + //System.out.println("took " + e); } } else { System.out.println("Usage: clear");