Changeset 7806


Ignore:
Timestamp:
11/11/11 18:24:45 (8 years ago)
Author:
aivar
Message:

Working on calling the curvefitter

Location:
trunk/projects/slim-plugin/src/main/java/imagej/slim/fitting
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/slim-plugin/src/main/java/imagej/slim/fitting/callable/SLIMCurveCallable.java

    r7805 r7806  
    4040import imagej.slim.fitting.params.ILocalFitResults; 
    4141import java.util.Random; 
     42import loci.curvefitter.CurveFitData; 
     43import loci.curvefitter.GrayCurveFitter; 
     44import loci.curvefitter.GrayNRCurveFitter; 
     45import loci.curvefitter.ICurveFitData; 
     46import loci.curvefitter.ICurveFitter; 
     47import loci.curvefitter.JaolhoCurveFitter; 
     48import loci.curvefitter.MarkwardtCurveFitter; 
     49import loci.curvefitter.SLIMCurveFitter; 
    4250 
    4351/** 
     
    4654 */ 
    4755public class SLIMCurveCallable implements IFittingEngineCallable { 
    48     private IGlobalFitParams _params; 
    49     private ILocalFitParams _data; 
     56    private IGlobalFitParams _globalParams; 
     57    private ILocalFitParams _localParams; 
    5058    private ILocalFitResults _result; 
     59    private ICurveFitter _curveFitter; 
    5160     
    52     public void setup(final IGlobalFitParams params, final ILocalFitParams data) { 
    53         _params = params; 
    54         _data = data; 
     61    public void setup(final IGlobalFitParams globalParams, final ILocalFitParams localParams) { 
     62        _globalParams = globalParams; 
     63        _localParams = localParams; 
    5564    } 
    5665     
    5766    public ILocalFitResults call() { 
    58         System.out.println(">>> " + _data.getId() + "-" + Thread.currentThread().getName()); 
     67        System.out.println(">>> " + _localParams.getId() + "-" + Thread.currentThread().getName()); 
    5968        _result = new LocalFitResult(); 
    60         _result.setId(_data.getId()); 
     69        _result.setId(_localParams.getId()); 
    6170  
    6271        if (true) { 
     
    7079        } 
    7180         
    72         System.out.println("<<< " + _data.getId() + "-" + Thread.currentThread().getName()); 
     81        System.out.println("<<< " + _localParams.getId() + "-" + Thread.currentThread().getName()); 
    7382        return _result; 
    7483    } 
  • trunk/projects/slim-plugin/src/main/java/imagej/slim/fitting/params/GlobalFitParams.java

    r7805 r7806  
    4242 */ 
    4343public class GlobalFitParams implements IGlobalFitParams { 
    44     private int _id; 
     44    private double[] _prompt; 
     45    int _startPrompt; 
     46    int _stopPrompt; 
     47    int _startDecay; 
     48    int _stopDecay; 
    4549     
    46     public void setId(int id) { 
    47         _id = id; 
     50    public void setPrompt(double[] prompt) { 
     51        _prompt = prompt; 
    4852    } 
    4953     
    50     public int getId() { 
    51         return _id; 
     54    public double[] getPrompt() { 
     55        return _prompt; 
     56    } 
     57     
     58    public void setStartPrompt(int startPrompt) { 
     59        _startPrompt = startPrompt; 
     60    } 
     61     
     62    public void setStopPrompt(int stopPrompt) { 
     63        _stopPrompt = stopPrompt; 
     64    } 
     65     
     66    public void setStartDecay(int startDecay) { 
     67        _startDecay = startDecay; 
     68    } 
     69     
     70    public void setStopDecay(int stopDecay) { 
     71        _stopDecay = stopDecay; 
    5272    } 
    5373} 
  • trunk/projects/slim-plugin/src/main/java/imagej/slim/fitting/params/IGlobalFitParams.java

    r7805 r7806  
    4343public interface IGlobalFitParams { 
    4444     
    45     public void setId(int id); 
     45    public void setPrompt(double[] prompt); 
    4646     
    47     public int getId(); 
    48      
     47    public double[] getPrompt();    
    4948} 
Note: See TracChangeset for help on using the changeset viewer.