Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 2569:0dd58ab7e118
Added functions to be used for fitting in the "Fixierungsanalyse" and "Extremwertermittlung".
flys-artifacts/trunk@4095 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 27 Feb 2012 14:16:30 +0000 |
| parents | 53e8bffbe06c |
| children | e123c5643f23 |
comparison
equal
deleted
inserted
replaced
| 2568:53e8bffbe06c | 2569:0dd58ab7e118 |
|---|---|
| 1 2012-02-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 2 | |
| 3 Added functions to be used for fitting in | |
| 4 the "Fixierungsanalyse" and "Extremwertermittlung". | |
| 5 | |
| 6 * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: New. | |
| 7 Abstract base class for functions to fit. Provides the name of the function, | |
| 8 a short description, the names of the parameters and an initial parameter guess | |
| 9 for the fit processe. Sub classes have to overwite the function evaluation and | |
| 10 the partial derivative of the function in respect to the parameters. | |
| 11 | |
| 12 TODO: Add a meachnism for the inverse function (needed for AT export) and | |
| 13 the first derivative (needed for the respective diagram). | |
| 14 | |
| 15 * src/main/java/de/intevation/flys/artifacts/math/fitting/FunctionFactory.java: | |
| 16 New. Factory to fetch a function by its name. | |
| 17 | |
| 18 * src/main/java/de/intevation/flys/artifacts/math/fitting/Exp.java: New. | |
| 19 exp: W(Q) = m * a^Q + b | |
| 20 | |
| 21 * src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java: New. | |
| 22 quad: W(Q) = n*Q^2 + m*Q + b | |
| 23 | |
| 24 * src/main/java/de/intevation/flys/artifacts/math/fitting/Linear.java: New. | |
| 25 linear: W(Q) = m*Q + b | |
| 26 | |
| 27 * src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java: New. | |
| 28 log-linear: W(Q) = a*ln(m*Q + b) | |
| 29 | |
| 30 * src/main/java/de/intevation/flys/artifacts/math/fitting/Log.java: New | |
| 31 log: W(Q) = m*ln(Q + b) | |
| 32 | |
| 33 * src/main/java/de/intevation/flys/artifacts/math/fitting/Pow.java: New. | |
| 34 pow: W(Q) = a*Q^c + d | |
| 35 | |
| 36 !!! This power function is new in the pool of functions to be fit. !!! | |
| 37 See my mail "Manuelle Punkte in der Fixierungsanalyse" 2011-10-27 for details. | |
| 38 The function exp-new found in the old FLYS function pool is omitted | |
| 39 because it is worthless and was maybe never used. | |
| 40 | |
| 41 * src/main/java/de/intevation/flys/artifacts/math/fitting/App.java: New. | |
| 42 Small test driver to check if the fitting is working. The points to | |
| 43 fit are read from stdin the function to fit is determined by the | |
| 44 system property 'function'. Example usage: | |
| 45 | |
| 46 $ mvn -e \ | |
| 47 -Dfunction=linear \ | |
| 48 -Dexec.mainClass=de.intevation.flys.artifacts.math.fitting.App exec:java <<EOF | |
| 49 357.390696917 7546.72096163 | |
| 50 61.4291036312 1334.54835721 | |
| 51 799.962128234 16836.7698076 | |
| 52 126.52761023 2703.69789985 | |
| 53 900.448553398 18955.0578748 | |
| 54 EOF | |
| 55 | |
| 1 2012-02-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 56 2012-02-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
| 2 | 57 |
| 3 * src/main/resources/messages_de.properties: | 58 * src/main/resources/messages_de.properties: |
| 4 Added ommitted translations. | 59 Added ommitted translations. |
| 5 | 60 |