Changeset 376 for trunk/ADOLC/include
 Timestamp:
 Dec 14, 2012 6:22:56 AM (7 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/ADOLC/include/adolc/adouble.h
r360 r376 136 136 /**/ 137 137 /* Comparison (friends) */ 138 #if defined(ADOLC_ADVANCED_BRANCHING) 138 139 friend ADOLC_DLL_EXPORT adub operator != ( const badouble&, const badouble& ); 139 //inline friend int operator != ( const badouble&, const badouble& ); 140 friend ADOLC_DLL_EXPORT adub operator == ( const badouble&, const badouble& ); 141 friend ADOLC_DLL_EXPORT adub operator <= ( const badouble&, const badouble& ); 142 friend ADOLC_DLL_EXPORT adub operator >= ( const badouble&, const badouble& ); 143 friend ADOLC_DLL_EXPORT adub operator > ( const badouble&, const badouble& ); 144 friend ADOLC_DLL_EXPORT adub operator < ( const badouble&, const badouble& ); 145 #else 146 inline friend int operator != ( const badouble&, const badouble& ); 147 inline friend int operator == ( const badouble&, const badouble& ); 148 inline friend int operator <= ( const badouble&, const badouble& ); 149 inline friend int operator >= ( const badouble&, const badouble& ); 150 inline friend int operator > ( const badouble&, const badouble& ); 151 inline friend int operator < ( const badouble&, const badouble& ); 152 #endif 140 153 inline friend int operator != ( double, const badouble& ); 141 154 friend ADOLC_DLL_EXPORT int operator != ( const badouble&, double ); 142 friend ADOLC_DLL_EXPORT adub operator == ( const badouble&, const badouble& );143 //inline friend int operator == ( const badouble&, const badouble& );144 155 inline friend int operator == ( double, const badouble& ); 145 156 friend ADOLC_DLL_EXPORT int operator == ( const badouble&, double ); 146 friend ADOLC_DLL_EXPORT adub operator <= ( const badouble&, const badouble& );147 //inline friend int operator <= ( const badouble&, const badouble& );148 157 inline friend int operator <= ( double, const badouble& ); 149 158 friend ADOLC_DLL_EXPORT int operator <= ( const badouble&, double ); 150 friend ADOLC_DLL_EXPORT adub operator >= ( const badouble&, const badouble& );151 //inline friend int operator >= ( const badouble&, const badouble& );152 159 inline friend int operator >= ( double, const badouble& ); 153 160 friend ADOLC_DLL_EXPORT int operator >= ( const badouble&, double ); 154 friend ADOLC_DLL_EXPORT adub operator > ( const badouble&, const badouble& );155 //inline friend int operator > ( const badouble&, const badouble& );156 161 inline friend int operator > ( double, const badouble& ); 157 162 friend ADOLC_DLL_EXPORT int operator > ( const badouble&, double ); 158 friend ADOLC_DLL_EXPORT adub operator < ( const badouble&, const badouble& );159 //inline friend int operator < ( const badouble&, const badouble& );160 163 inline friend int operator < ( double, const badouble& ); 161 164 friend ADOLC_DLL_EXPORT int operator < ( const badouble&, double ); … … 393 396 /**/ 394 397 /* Comparison */ 395 /* 398 399 #if !defined(ADOLC_ADVANCED_BRANCHING) 396 400 inline int operator != ( const badouble& u, const badouble& v ) { 397 401 return (uv != 0); 398 402 } 399 */ 403 404 inline int operator == ( const badouble& u, const badouble& v ) { 405 return (uv == 0); 406 } 407 408 inline int operator <= ( const badouble& u, const badouble& v ) { 409 return (uv <= 0); 410 } 411 412 inline int operator >= ( const badouble& u, const badouble& v ) { 413 return (uv >= 0); 414 } 415 416 inline int operator > ( const badouble& u, const badouble& v ) { 417 return (uv > 0); 418 } 419 420 inline int operator < ( const badouble& u, const badouble& v ) { 421 return (uv < 0); 422 } 423 #endif 400 424 401 425 inline int operator != ( double coval, const badouble& v) { … … 406 430 } 407 431 408 /*409 inline int operator == ( const badouble& u, const badouble& v ) {410 return (uv == 0);411 }412 */413 414 432 inline int operator == ( double coval, const badouble& v) { 415 433 if (coval) … … 419 437 } 420 438 421 /*422 inline int operator <= ( const badouble& u, const badouble& v ) {423 return (uv <= 0);424 }425 */426 427 439 inline int operator <= ( double coval, const badouble& v ) { 428 440 if (coval) … … 432 444 } 433 445 434 /*435 inline int operator >= ( const badouble& u, const badouble& v ) {436 return (uv >= 0);437 }438 */439 440 446 inline int operator >= ( double coval, const badouble& v ) { 441 447 if (coval) … … 445 451 } 446 452 447 /*448 inline int operator > ( const badouble& u, const badouble& v ) {449 return (uv > 0);450 }451 */452 453 453 inline int operator > ( double coval, const badouble& v ) { 454 454 if (coval) … … 457 457 return (v < 0); 458 458 } 459 460 /*461 inline int operator < ( const badouble& u, const badouble& v ) {462 return (uv < 0);463 }464 */465 459 466 460 inline int operator < ( double coval, const badouble& v ) {
Note: See TracChangeset
for help on using the changeset viewer.