IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14430


Ignore:
Timestamp:
Aug 8, 2007, 9:59:22 AM (19 years ago)
Author:
Paul Price
Message:

Adding skewness and kurtosis

Location:
trunk/ppStats/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppStats/src/ppStatsReadout.c

    r14394 r14430  
    6161        int sampleSpace = 1.0 / data->sample; // Space between samples
    6262        psVector *sampleValues = psVectorAlloc(numSamples, PS_TYPE_F32); // Vector of samples
    63         psVector *sampleMask = NULL;  // Corresponding mask
     63        psVector *sampleMask = psVectorAlloc(numSamples, PS_TYPE_MASK);  // Corresponding mask
     64        if (!mask) {
     65            psVectorInit(sampleMask, 0);
     66        }
    6467        bool warnNonFinite = false;     // Have we warned about non-finite values?
    65         if (mask) {
    66             sampleMask = psVectorAlloc(numSamples, PS_TYPE_U8);
    67         }
    6868        for (int i = 0; i < numSamples; i++) {
    6969            int j = i * sampleSpace;
    … …  
    7777                    warnNonFinite = true;
    7878                }
    79                 sampleMask->data.U8[i] = data->maskVal;
    80             }
    81             if (mask) {
    82                 sampleMask->data.U8[i] = mask->data.U8[y][x];
     79                sampleMask->data.PS_TYPE_MASK_DATA[i] = data->maskVal;
     80            } else if (mask) {
     81                sampleMask->data.PS_TYPE_MASK_DATA[i] = mask->data.PS_TYPE_MASK_DATA[y][x];
    8382            }
    8483        }
    … …  
    9695    }
    9796
    98     WRITE_STAT(PS_STAT_SAMPLE_MEAN,     "SAMPLE_MEAN",   sampleMean);
    99     WRITE_STAT(PS_STAT_SAMPLE_MEDIAN,   "SAMPLE_MEDIAN", sampleMedian);
    100     WRITE_STAT(PS_STAT_SAMPLE_STDEV,    "SAMPLE_STDEV",  sampleStdev);
    101     WRITE_STAT(PS_STAT_SAMPLE_QUARTILE, "SAMPLE_LQ",     sampleLQ);
    102     WRITE_STAT(PS_STAT_SAMPLE_QUARTILE, "SAMPLE_UQ",     sampleUQ);
    103     WRITE_STAT(PS_STAT_ROBUST_MEDIAN,   "ROBUST_MEDIAN", robustMedian);
    104     WRITE_STAT(PS_STAT_ROBUST_STDEV,    "ROBUST_STDEV",  robustStdev);
    105     WRITE_STAT(PS_STAT_ROBUST_QUARTILE, "ROBUST_LQ",     robustLQ);
    106     WRITE_STAT(PS_STAT_ROBUST_QUARTILE, "ROBUST_UQ",     robustUQ);
    107     WRITE_STAT(PS_STAT_ROBUST_QUARTILE, "ROBUST_N50",    robustN50);
    108     WRITE_STAT(PS_STAT_FITTED_MEAN,     "FITTED_MEAN",   fittedMean);
    109     WRITE_STAT(PS_STAT_FITTED_STDEV,    "FITTED_STDEV",  fittedStdev);
    110     WRITE_STAT(PS_STAT_CLIPPED_MEAN,    "CLIPPED_MEAN",  clippedMean);
    111     WRITE_STAT(PS_STAT_CLIPPED_STDEV,   "CLIPPED_STDEV", clippedStdev);
     97    WRITE_STAT(PS_STAT_SAMPLE_MEAN,     "SAMPLE_MEAN",     sampleMean);
     98    WRITE_STAT(PS_STAT_SAMPLE_MEDIAN,   "SAMPLE_MEDIAN",   sampleMedian);
     99    WRITE_STAT(PS_STAT_SAMPLE_STDEV,    "SAMPLE_STDEV",    sampleStdev);
     100    WRITE_STAT(PS_STAT_SAMPLE_SKEWNESS, "SAMPLE_SKEWNESS", sampleSkewness);
     101    WRITE_STAT(PS_STAT_SAMPLE_KURTOSIS, "SAMPLE_KURTOSIS", sampleKurtosis);
     102    WRITE_STAT(PS_STAT_SAMPLE_QUARTILE, "SAMPLE_LQ",       sampleLQ);
     103    WRITE_STAT(PS_STAT_SAMPLE_QUARTILE, "SAMPLE_UQ",       sampleUQ);
     104    WRITE_STAT(PS_STAT_ROBUST_MEDIAN,   "ROBUST_MEDIAN",   robustMedian);
     105    WRITE_STAT(PS_STAT_ROBUST_STDEV,    "ROBUST_STDEV",    robustStdev);
     106    WRITE_STAT(PS_STAT_ROBUST_QUARTILE, "ROBUST_LQ",       robustLQ);
     107    WRITE_STAT(PS_STAT_ROBUST_QUARTILE, "ROBUST_UQ",       robustUQ);
     108    WRITE_STAT(PS_STAT_ROBUST_QUARTILE, "ROBUST_N50",      robustN50);
     109    WRITE_STAT(PS_STAT_FITTED_MEAN,     "FITTED_MEAN",     fittedMean);
     110    WRITE_STAT(PS_STAT_FITTED_STDEV,    "FITTED_STDEV",    fittedStdev);
     111    WRITE_STAT(PS_STAT_CLIPPED_MEAN,    "CLIPPED_MEAN",    clippedMean);
     112    WRITE_STAT(PS_STAT_CLIPPED_STDEV,   "CLIPPED_STDEV",   clippedStdev);
    112113
    113114    // measure other types of statistics tests

  • trunk/ppStats/src/ppStatsSetupFromArgs.c

    r14020 r14430  
    127127    statsOptionArguments(arguments, "-median", data,   PS_STAT_SAMPLE_MEDIAN);
    128128    statsOptionArguments(arguments, "-quartile", data, PS_STAT_SAMPLE_QUARTILE);
     129    statsOptionArguments(arguments, "-skewness", data, PS_STAT_SAMPLE_SKEWNESS);
     130    statsOptionArguments(arguments, "-kurtosis", data, PS_STAT_SAMPLE_KURTOSIS);
    129131    statsOptionArguments(arguments, "-robust-median", data,   PS_STAT_ROBUST_MEDIAN);
    130132    statsOptionArguments(arguments, "-robust-stdev", data,    PS_STAT_ROBUST_STDEV);
    … …  
    148150            psError(PS_ERR_IO, false, "Unable to open input file %s\n", resolved);
    149151            psFree(resolved);
    150             result = PS_EXIT_DATA_ERROR;
     152            result = PS_EXIT_DATA_ERROR;
    151153            goto die;
    152154        }
    … …  
    158160            psError(PS_ERR_UNKNOWN, false, "Unable to determine camera format for %s\n", inName);
    159161            psFree(header);
    160             result = PS_EXIT_DATA_ERROR;
     162            result = PS_EXIT_DATA_ERROR;
    161163            goto die;
    162164        }
    … …  
    166168            psFree(header);
    167169            psFree(format);
    168             result = PS_EXIT_CONFIG_ERROR;
     170            result = PS_EXIT_CONFIG_ERROR;
    169171            goto die;
    170172        }
    … …  
    174176        if (!data->fileView) {
    175177            psError(PS_ERR_UNKNOWN, false, "Unable to add input file %s to FPA.\n", inName);
    176             result = PS_EXIT_CONFIG_ERROR;
     178            result = PS_EXIT_CONFIG_ERROR;
    177179            goto die;
    178180        }
Note: See TracChangeset for help on using the changeset viewer.