Revision 1317 trunk/src/linad99/newfmin.cpp

newfmin.cpp (revision 1317)
40 40
  #include <iostream.h>
41 41
  #include <conio.h>
42 42
#endif
43
#if defined (__WAT32__) || defined (__MSVC32__)
43
#if defined (__WAT32__) || defined (_MSC_VER)
44 44
  #include <conio.h>
45 45
#endif
46 46
#if defined(__CYGWIN__)
......
75 75
    void clrscr();
76 76
  };
77 77
#endif
78
#if defined (__MSVC32__)
78
#if defined (_MSC_VER)
79 79
  void __cdecl clrscr(void);
80 80
#endif
81 81
#include <math.h>
......
163 163
  logstream << setprecision(13) << x << endl;
164 164
  logstream << setprecision(13) << g << endl;
165 165
}
166
extern adtimer * pfmintime=0;
166
adtimer* pfmintime = 0;
167 167
extern int traceflag;
168 168
//#pragma warn -sig
169 169

  
......
248 248
         2 (call2 - line search and Hessian update)
249 249
         >=3 (derivative check)
250 250
  */
251
#if !defined (__MSVC32__)
252
    #if defined( __SUN__) && !(defined __GNU__)
253
      #if defined( __HP__)
251
#if !defined (_MSC_VER)
252
  #if defined( __SUN__) && !(defined __GNU__)
253
    #if defined( __HP__)
254 254
        if (ireturn <= 0 )
255 255
        {
256 256
	   signal(SIGINT, &onintr);
257 257
        }
258
      #else
258
    #else
259 259
        if (ireturn <= 0 )
260 260
        {
261 261
	   signal(SIGINT, (SIG_PF)&onintr);
262 262
        }
263
      #endif
264 263
    #endif
265
 #endif
266
    #if defined( __GNU__) || defined (__BORLANDC__)
264
  #endif
265
#endif
266
#if defined( __GNU__) || defined (__BORLANDC__)
267 267
      if (ireturn <= 0 )
268 268
      {
269 269
	 signal(SIGINT, &onintr);
270 270
      }
271
    #endif
272
    #ifdef __ZTC__
271
#endif
272
#ifdef __ZTC__
273 273
      if (ireturn <= 0 )
274 274
      {
275 275
        if (disp_inited == 0)
......
278 278
          disp_usebios();
279 279
        }
280 280
      }
281
    #endif
281
#endif
282 282
  tracing_message(traceflag,"A5");
283 283
      if (ireturn ==1 && dcheck_flag ==0)
284 284
      {
......
492 492
         goto label21;
493 493
#endif
494 494
      if (llog) goto label7010;
495
#     if   !defined (__MSVC32__)  && !defined (__WAT32__) && !defined(linux)
495
#if !defined (_MSC_VER) && !defined (__WAT32__) && !defined(__linux__)
496 496
        if (!scroll_flag) clrscr();
497
#     endif
497
#endif
498 498
label7003: /* Printing table header */
499 499
      if (iprint>0)
500 500
      {
......
507 507
          }
508 508
	  (*ad_printf)("\nFunction value %15.7le; maximum gradient component mag %12.4le\n",
509 509
#if defined(USE_DDOUBLE)
510
#undef double
510
  #undef double
511 511
              double(f), double(gmax));
512
#define double dd_real
512
  #define double dd_real
513 513
#else
514 514
              f, gmax);
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff