Changes between Version 58 and Version 59 of svnbranches

Timestamp:

11/12/12 15:27:41 (12 years ago)

Author:

mark

Comment:

--

svnbranches

@@ -6 +6 @@
 == Genius core ==
 ||'''Branch'''||'''Features'''||'''Status'''||'''Merged with NegotiatorGUI'''||
+||~~!GeniusCore~~|| Core classes of Genius. ||Inactive (October 2010)|| Yes (rev. 1206) ||
 ||GeniusCoreXStream|| Core classes of Genius. In addition, support for Xstream serialization. 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||
@@ -12 +13 @@
 == Genius desktop version ==
 ||'''Branch'''||'''Features'''||'''Status'''||'''Merged with NegotiatorGUI'''||
-||GeniusBI||Non-web version of Genius 3.0. Implements an asynchronous protocol in which multiple offers can be made in a single turn. Also, there is support for mediators. ||Inactive (June 2011)|| No||
-||~~!GeniusCore~~|| Core classes of Genius. ||Inactive (October 2010)|| Yes (rev. 1206) || 
+||GeniusBI||Non-web version of Genius 3.0. Implements an asynchronous protocol in which multiple offers can be made in a single turn. Also, there is support for mediators. ||Inactive (June 2011)|| No|| 
 ||!GeniusMultiLateral||Recent non-web version of Genius which implements multi-party negotiations with possibly non-linear utility functions. ||Active|| No||
 ||~~!GeniusMultiLateralNonlinear~~||Older version of !GeniusMultiLateral. ||Active|| No||