Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java @ 6780:b8f94e865875
S/Q relation: Part I of 'faking' fitting linear data. S/Qs can now be subclassed and processed through views. TODO: Add knob to setup a linear data path.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 08 Aug 2013 12:17:03 +0200 |
| parents | af13ceeba52a |
| children | 51eb6491c537 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java Thu Aug 08 12:06:54 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQRelationCalculation.java Thu Aug 08 12:17:03 2013 +0200 @@ -114,8 +114,12 @@ addProblem("sq.missing.sq.function"); } + SQ.View sqView = SQ.SQ_VIEW; + SQ.Factory sqFactory = SQ.SQ_FACTORY; + Measurements measurements = - MeasurementFactory.getMeasurements(river, location, period); + MeasurementFactory.getMeasurements( + river, location, period, sqFactory); SQFractionResult [] fractionResults = new SQFractionResult[SQResult.NUMBER_FRACTIONS]; @@ -126,7 +130,7 @@ SQFractionResult fractionResult; List<SQFractionResult.Iteration> iterations = - doFitting(function, sqs); + doFitting(function, sqs, sqView); if (iterations == null) { // TODO: i18n @@ -149,12 +153,13 @@ protected List<SQFractionResult.Iteration> doFitting( final Function function, - List<SQ> sqs + List<SQ> sqs, + SQ.View sqView ) { final List<SQFractionResult.Iteration> iterations = new ArrayList<SQFractionResult.Iteration>(); - boolean success = new Fitting(function, outliers).fit( + boolean success = new Fitting(function, outliers, sqView).fit( sqs, method, new Fitting.Callback() {