[Javapathfinder-svn] SF.net SVN: javapathfinder:[1027] trunk

[<pcm...@us...>]

Revision: 1027
          http://javapathfinder.svn.sourceforge.net/javapathfinder/?rev=1027&view=rev
Author:   pcmehlitz
Date:     2008-09-27 03:00:02 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
some more HeuristicSearch cleanup:

* created very simple HeuristicStateQueue. Much less sophisticated than the red-black tree based TreeMap,
but for limited queue sizes (which is one of the main purposes in life for HeuristicSearch) the simple
insert/remove and compare (no more Comparator) already offset the slower lookup. Uses less memory because
it is based on HeuristicState next/prev link fields (they ever get re-used)

* the sort order has changed slightly (was using state-id and hashcodes as secondary orders, but the
state-id is redundant to order of insert, and the hash codes are meaningless with respect to
heuristics. Still it might produce different traces than the old version

* DFSComparator wasn't overriding compare. DefaultComparator not required anymore. Removed

* not sure what the BeamSearch parent copying was about, it seemed superfluous. Removed

Modified Paths:
--------------
    trunk/default.properties
    trunk/src/gov/nasa/jpf/search/heuristic/BeamSearch.java
    trunk/src/gov/nasa/jpf/search/heuristic/HeuristicSearch.java
    trunk/src/gov/nasa/jpf/search/heuristic/HeuristicState.java
    trunk/test/gov/nasa/jpf/mc/TestCrossingJPF.java

Added Paths:
-----------
    trunk/src/gov/nasa/jpf/search/heuristic/HeuristicStateQueue.java

Removed Paths:
-------------
    trunk/src/gov/nasa/jpf/search/heuristic/DFSComparator.java
    trunk/src/gov/nasa/jpf/search/heuristic/DefaultComparator.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.