Revision 1971 trunk/src/nh99/mod_mc.cpp

mod_mc.cpp (revision 1971)
181 181

  
182 182
      //double fbest;
183 183

  
184
      if (!ad_comm::pvm_manager)
184
#ifdef USE_ADPVM
185
      if (ad_comm::pvm_manager)
185 186
      {
186
        /*fbest=*/get_monte_carlo_value(nvar,x);
187
      }
188
      else
189
      {
190 187
        switch (ad_comm::pvm_manager->mode)
191 188
        {
192 189
        case 1: // master
......
200 197
          exit(1);
201 198
        }
202 199
      }
200
      else
201
#endif
202
      {
203
        /*fbest=*/get_monte_carlo_value(nvar,x);
204
      }
203 205

  
204 206
      multivariate_mixture(bmn,nvar,iseed,log_tprob_normal,
205 207
        log_tprob_cauchy,log_tprob_small_normal,-1);
......
301 303

  
302 304

  
303 305
       // ogs << log_tprob << " " << ll << " " << x << endl;
304
        if (!ad_comm::pvm_manager)
306
#ifdef USE_ADPVM
307
        if (ad_comm::pvm_manager)
305 308
        {
306
          get_monte_carlo_value(nvar,x);
307
        }
308
        else
309
        {
310 309
          switch (ad_comm::pvm_manager->mode)
311 310
          {
312 311
          case 1: // master
......
320 319
            exit(1);
321 320
          }
322 321
        }
322
        else
323
#endif
324
        {
325
          get_monte_carlo_value(nvar,x);
326
        }
323 327

  
324 328
        //ooff << setw(12) << -f-log_tprob << "  "
325 329
        //     << setw(12) << -f-log_tprob-ll << "  "

Also available in: Unified diff