Changeset 7841 for trunk/projects


Ignore:
Timestamp:
12/20/11 18:44:10 (8 years ago)
Author:
aivar
Message:

Gets the noise model to the fitter.

Location:
trunk/projects/curve-fitter/src/main/java/loci/curvefitter
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/curve-fitter/src/main/java/loci/curvefitter/AbstractCurveFitter.java

    r7810 r7841  
    3838 * Abstract base class for curve fitters. 
    3939 * 
    40  * @author Aivar Grislis 
     40 * @author Aivar Grislis grislis at wisc dot edu 
    4141 */ 
    4242public abstract class AbstractCurveFitter implements ICurveFitter { 
    4343    FitAlgorithm m_fitAlgorithm; 
    4444    FitFunction m_fitFunction; 
     45    NoiseModel m_noiseModel; 
    4546    double m_xInc = ICurveFitter.DEFAULT_X_INC; 
    4647    boolean[] m_free; 
     
    6566    public void setFitFunction(FitFunction function) { 
    6667        m_fitFunction = function; 
     68    } 
     69 
     70    @Override 
     71    public NoiseModel getNoiseModel() { 
     72        return m_noiseModel; 
     73    } 
     74 
     75    @Override 
     76    public void setNoiseModel(NoiseModel noiseModel) { 
     77        m_noiseModel = noiseModel; 
    6778    } 
    6879 
  • trunk/projects/curve-fitter/src/main/java/loci/curvefitter/ICurveFitData.java

    r7810 r7841  
    171171     * @param chiSquare targetted chi square 
    172172     */ 
    173     public void setChiSquareTarget(double chiSquareTarget); 
    174      
     173    public void setChiSquareTarget(double chiSquareTarget);  
    175174 
    176175    /** 
  • trunk/projects/curve-fitter/src/main/java/loci/curvefitter/ICurveFitter.java

    r7810 r7841  
    5555        SINGLE_EXPONENTIAL, DOUBLE_EXPONENTIAL, TRIPLE_EXPONENTIAL, STRETCHED_EXPONENTIAL 
    5656    } 
     57     
     58    /** 
     59     * Specifies noise model for fit. 
     60     */ 
     61    public enum NoiseModel { 
     62        GAUSSIAN_FIT, POISSON_FIT, POISSON_DATA, MAXIMUM_LIKELIHOOD 
     63    } 
    5764 
    5865    /** 
     
    8895     */ 
    8996    public void setFitFunction(FitFunction function); 
     97     
     98    /** 
     99     * Get noise model for fit. 
     100     *  
     101     * @return  
     102     */ 
     103    public NoiseModel getNoiseModel(); 
     104 
     105    /** 
     106     * Sets noise model for fit. 
     107     *  
     108     * @param noiseModel  
     109     */ 
     110    public void setNoiseModel(NoiseModel noiseModel); 
    90111 
    91112    /** 
  • trunk/projects/curve-fitter/src/main/java/loci/curvefitter/SLIMCurveFitter.java

    r7810 r7841  
    224224            } 
    225225        } 
    226  
     226         
    227227        if (s_libraryOnPath) { 
    228228            // JNA version 
Note: See TracChangeset for help on using the changeset viewer.