Index: analysis.c
===================================================================
RCS file: /cvsroot/gnubg/gnubg/analysis.c,v
retrieving revision 1.157
diff -r1.157 analysis.c
289,329d288
<  * get cash point regardless of match or money play
<  */
< 
< static float
< CashPoint( const matchstate* pms, float arOutput[] )
< {
<     cubeinfo ci;
<     float aarRates[ 2 ][ 2 ];
<     int afAutoRedouble[ 2 ];
<     int afDead[ 2 ];
< 
<     GetMatchStateCubeInfo( &ci, pms );
< 
<     calculate_gammon_rates( aarRates, arOutput, &ci );
< 
<     if ( ci.nMatchTo ) {
<     	/* Match play */
< 	float aaarPointsMatch[ 2 ][ 4 ][ 2 ];
< 	int nIndex;
< 
< 	getMatchPoints( aaarPointsMatch, afAutoRedouble, afDead,
< 		    &ci, aarRates );
< 
< 	nIndex = ! afDead[ 0 ];
< 
< 	return aaarPointsMatch[ 0 ][ 2 ][ nIndex ];
<     }
<     else {
<     	/* Money play */
<     	float aaarPointsMoney[ 2 ][ 7 ][ 2 ];
< 
< 	getMoneyPoints( aaarPointsMoney, ci.fJacoby, ci.fBeavers, aarRates );
< 
< 	return aaarPointsMoney[ 0 ][ 5 ][ 0 ];
<     }
<     assert( 0 );
<     return 0.0;
< }
< 
< 
< /*
425,426c384
<         if ( pmr->CubeDecPtr->aarOutput[ 0 ][ OUTPUT_WIN ] >= 
<              CashPoint( pms, pmr->CubeDecPtr->aarOutput[ 0 ] ) ) {
---
>         if ( arDouble[ OUTPUT_TAKE ] > 1.0f ) {
544,545c502
<         if ( pmr->CubeDecPtr->aarOutput[ 0 ][ OUTPUT_WIN ] >=
< 	     CashPoint( pms, pmr->CubeDecPtr->aarOutput[ 0 ] ) ) {
---
>         if ( arDouble[ OUTPUT_NODOUBLE ] > 1.0f ) {