Changes between Version 49 and Version 50 of svnbranches

Timestamp:

11/12/12 13:32:30 (12 years ago)

Author:

mark

Comment:

--

svnbranches

@@ -7 +7 @@
 == Genius core ==
 ||'''Branch'''||'''Features'''||'''Status'''||'''Merged with NegotiatorGUI'''||
-||!GeniusCore|| Core classes of Genius. ||Inactive (October 2010)|| Yes (rev. 1206) ||
+||~~!GeniusCore~~|| Core classes of Genius. ||Inactive (October 2010)|| Yes (rev. 1206) ||
 ||GeniusCoreXStream|| Core classes of Genius. In addition, support for Xstream serialization. Seems to include some fixes not found in the mainbranch (repository caching). Includes CPNet domains but misses implementation.|| Inactive (March 2011)|| Yes (rev. 1357). Excluding utility functions and XStream serialization||
 ||GeniusGUI||Recent non-web version of Genius which implements CPNets.||Inactive (March 2011)|| No||
@@ -18 +18 @@
 ||!GeniusNegotiatingSalesman|| This branch can be removed as it is a clone of an existing branch with some new unused classes.|| Inactive (March 2012) || Yes (rev. 1698). Zipped unique contents (backup/GeniusNegotiatingSalesman.zip)||
 ||!GeniusTeamNego||Recent non-web version of Genius which implements team negotiations with mediators. ||Inactive (May 2012)|| No||
-||Negotiator||Old non-web version of Genius, use NegotiatorGUI instead. Includes an implementation of a class to keep an agent alive over multiple negotiations.||Inactive (June 2008)|| Yes (rev. 406)||
-||Negotiator20||Old non-web version of Genius, use NegotiatorGUI instead. Includes an implementation of a class to keep an agent alive over multiple negotiations.||Inactive (June 2008)|| Yes (rev. 407)||
+||~~Negotiator~~||Old non-web version of Genius, use NegotiatorGUI instead. Includes an implementation of a class to keep an agent alive over multiple negotiations.||Inactive (June 2008)|| Yes (rev. 406)||
+||~~Negotiator20~~||Old non-web version of Genius, use NegotiatorGUI instead. Includes an implementation of a class to keep an agent alive over multiple negotiations.||Inactive (June 2008)|| Yes (rev. 407)||
 ||NegotiatorGRID||Non-web version of Genius 3.0. Repository contains a large set of corrupted files (filled with NULL). Overall, cleans up and adds comments to a large set of existing classes. Adds the !MultiPhaseAuctionMany protocol, unfortunately the file is corrupt.||Inactive (October 2010)|| No||
 ||NegotiatorGUI||Version used to run ANAC competition. Non-web version of Genius which contains BOA framework -- which allows to separately develop the bidding strategy, acceptance strategy, opponent model -- and allows to distribute a tournament over multiple computers using a simple database.||Active|| X||
 ||!NegotiatorProtocol||Non-web version of Genius 3.0 which implements WSagreement protocol, which allows to specify the ranges of issues in an offer (for example: the price for the laptop should be between 800 and 900). A WSAgent is a more generic version of a normal agent. Therefore, normal agents are not compatible with the protocol. Can be merged with main branch.||Inactive (April 2009)|| No||
 ||GeniusS||Old non-web version of Genius, use NegotiatorGUI instead.||Inactive (November 2010)|| Yes (rev. 1266)||
-||!NegotiatorWeb|| Old non-web version of Genius (despite its name). All functionality has been added to NegotiatorGUI branch.||Inactive (August 2009)|| Yes (rev. 673)||
+||~~!NegotiatorWeb~~|| Old non-web version of Genius (despite its name). All functionality has been added to NegotiatorGUI branch.||Inactive (August 2009)|| Yes (rev. 673)||
 
 == Genius web version ==