phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed throwing away results bug, tweaked TileExpander blocking interval

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@913 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Tom Copeland
2002-09-11 18:19:26 +00:00
parent 789a4fa899
commit f06d8e72d3
8 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPD.java
View File

@ -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");

34
pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPDResultsImpl.java
View File

@ -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;
}
}
}
*/
}

25
pmd-dcpd/src/net/sourceforge/pmd/dcpd/DGST.java
View File

@ -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;i<tile.getTokens().size(); i++) {
TokenEntry tok = (TokenEntry)tile.getTokens().get(i);
for (int k=0; k<candidate.getTokens().size(); k++) {
TokenEntry candidateToken = (TokenEntry)candidate.getTokens().get(k);
if (tok.getTokenSrcID().equals(candidateToken.getTokenSrcID()) &&
tok.getBeginLine() == candidateToken.getBeginLine() &&
tok.getImage().equals(candidateToken.getImage())) {
System.out.println("DISCARD");
return true;
}
}
}
}
return false;
}
*/
}

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/JobAddedListener.java
View File

@ -27,7 +27,7 @@ public class JobAddedListener extends UnicastRemoteObject implements RemoteEvent
public void notify(RemoteEvent event) throws UnknownEventException, RemoteException {
try {
Job job = (Job)space.take(new Job(), null, 1000);
Job job = (Job)space.read(new Job(), null, 1000);
worker.jobAdded(job);
} catch (Exception e) {
e.printStackTrace();

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/TileExpander.java
View File

@ -32,7 +32,7 @@ public class TileExpander {
Batch batch = null;
int total = 0;
while ((batch = (Batch)space.take(twQuery, null, 10)) != null) {
while ((batch = (Batch)space.take(twQuery, null, 100)) != null) {
total++;
List wrappers = new ArrayList();
for (int j=0; j<batch.tileWrappers.size(); j++) {

3
pmd-dcpd/src/net/sourceforge/pmd/dcpd/TileHarvester.java
View File

@ -33,6 +33,9 @@ public class TileHarvester {
for (int j=0; j<batch.tileWrappers.size(); j++) {
addTileWrapperToOccurrences((TileWrapper)batch.tileWrappers.get(j), occ);
}
if (i >0 && i % 100 == 0) {
System.out.println("Harvested " + i + " batches so far");
}
}
return occ;
}

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/TilePlanter.java
View File

@ -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");
}
}
}

3
pmd-dcpd/src/net/sourceforge/pmd/dcpd/Util.java
View File

@ -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");