Changes between Version 36 and Version 37 of svnbranches

Timestamp:

09/25/12 12:44:45 (12 years ago)

Author:

mark

Comment:

--

svnbranches

@@ -16 +16 @@
 ||!GeniusMultiLateral||Recent non-web version of Genius which implements multi-party negotiations with possibly non-linear utility functions. ||Active|| No||
 ||~~!GeniusMultiLateralNonlinear~~|| Recent non-web version of Genius which implements multi-party negotiations with possibly non-linear utility functions. This branch is fully merged with !GeniusMultilateral. || Inactive (June 2012) || No|| 
-||~~!GeniusNegotiatingSalesman~~|| This branch can be removed as it is a clone of an existing branch with some new unused classes.|| Inactive (March 2012) || No||
+||!GeniusNegotiatingSalesman|| This branch can be removed as it is a clone of an existing branch with some new unused classes.|| Inactive (March 2012) || No||
 ||!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|| No||
 ||!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)||
+||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)||
 
 == Genius web version ==