Changeset 39237 for trunk

Timestamp:

Dec 8, 2015, 7:16:07 AM (11 years ago)

Author:

eugene

Message:

adding IRLS

Location:

trunk/Ohana/src/relastro/src

Files:

• FitPM_IRLS.c (added)
• UpdateObjects.c (modified) (3 diffs)

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -154 +154 @@
       // if N_BOOTSTRAP_SAMPLES = 1, no bootstrap resampling:
       FitPM (&fitPM, fitStats->fitdataPM, fitStats->points, fitStats->Npoints);
+      // FitPM_IRLS (&fitPM, fitStats->fitdataPM, fitStats->points, fitStats->Npoints);
     } else {
       fitStats->Nfit = 0;
       for (k = 0; k < fitStats->NfitAlloc; k++) {
         BootstrapResample (fitStats->sample, fitStats->points, fitStats->Npoints);
+        // if (!FitPM_IRLS (&fitStats->fit[k], fitStats->fitdataPM, fitStats->sample, fitStats->Npoints)) continue;
         if (!FitPM (&fitStats->fit[k], fitStats->fitdataPM, fitStats->sample, fitStats->Npoints)) continue;
         fitStats->Nfit ++;
@@ -198 +200 @@
     if (fitStats->NfitAlloc == 1) {
       // if N_BOOTSTRAP_SAMPLES = 1, no bootstrap resampling:
+      // FitPMandPar_IRLS (&fitPar, fitStats->fitdataPar, fitStats->points, fitStats->Npoints);
       FitPMandPar (&fitPar, fitStats->fitdataPar, fitStats->points, fitStats->Npoints);
     } else {
@@ -203 +206 @@
       for (k = 0; k < fitStats->NfitAlloc; k++) {
         BootstrapResample (fitStats->sample, fitStats->points, fitStats->Npoints);
-        FitPMandPar (&fitStats->fit[k], fitStats->fitdataPar, fitStats->sample, fitStats->Npoints);
+        // FitPMandPar_IRLS (&fitStats->fit[k], fitStats->fitdataPar, fitStats->sample, fitStats->Npoints);
+        FitPMandPar_IRLS (&fitStats->fit[k], fitStats->fitdataPar, fitStats->sample, fitStats->Npoints);
         fitStats->Nfit ++;
       }