Revision 1971

trunk/src/nh99/xmodelm3.cpp (revision 1971)
346 346
        {
347 347
          trust_region_update(nvar,_crit,x,g,f);
348 348
        }
349
        if (!ad_comm::pvm_manager)
349
#if defined(USE_ADPVM)
350
        if (ad_comm::pvm_manager)
350 351
        {
352
          if (random_effects_flag)
353
          {
354
            if (maxfn>0)
355
            {
356
              switch (ad_comm::pvm_manager->mode)
357
              {
358
              case 1: // master
359
                quasi_newton_block_pvm_master_random_effects(nvar,_crit,x,g,f);
360
                break;
361
              case 2: // slave
362
              // these don't exist yet
363
                function_evaluation_block_pvm_slave_random_effects
364
                  (nvar,_crit,x,g,f);
365
                break;
366
              default:
367
                cerr << "error illega value for pvm_manager->mode" << endl;
368
                exit(1);
369
              }
370
            }
371
          }
372
          else
373
          {
374
            if (maxfn>0)
375
            {
376
              switch (ad_comm::pvm_manager->mode)
377
              {
378
              case 1: // master
379
                quasi_newton_block_pvm_master(nvar,_crit,x,g,f);
380
                break;
381
              case 2: // slave
382
                function_evaluation_block_pvm_slave();
383
                break;
384
              default:
385
                cerr << "error illega value for pvm_manager->mode" << endl;
386
                exit(1);
387
              }
388
            }
389
          }
390
        }
391
        else
392
#endif
393
        {
351 394
          do
352 395
          {
353 396
            if (spminflag)
......
397 440
          }
398 441
          while(repeatminflag);
399 442
        }
400
        else
401
        {
402
#if defined(USE_ADPVM)
403
      if (random_effects_flag)
404
      {
405
        if (maxfn>0)
406
        {
407
          switch (ad_comm::pvm_manager->mode)
408
          {
409
          case 1: // master
410
            quasi_newton_block_pvm_master_random_effects(nvar,_crit,x,g,f);
411
            break;
412
          case 2: // slave
413
          // these don't exist yet
414
            function_evaluation_block_pvm_slave_random_effects
415
              (nvar,_crit,x,g,f);
416
            break;
417
          default:
418
            cerr << "error illega value for pvm_manager->mode" << endl;
419
            exit(1);
420
          }
421
        }
422
      }
423
      else
424
      {
425
        if (maxfn>0)
426
        {
427
          switch (ad_comm::pvm_manager->mode)
428
          {
429
          case 1: // master
430
            quasi_newton_block_pvm_master(nvar,_crit,x,g,f);
431
            break;
432
          case 2: // slave
433
            function_evaluation_block_pvm_slave();
434
            break;
435
          default:
436
            cerr << "error illega value for pvm_manager->mode" << endl;
437
            exit(1);
438
          }
439
        }
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff