ObjectProperty (applied-geodesy#445)

- Primitives replaced by ObjectProperty

Author: loesler

JAG3D/src/org/applied_geodesy/adjustment/statistic/TestStatisticParameterSet.java

@@ -21,62 +21,172 @@
 
 package org.applied_geodesy.adjustment.statistic;
 
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ObservableObjectValue;
+
 public class TestStatisticParameterSet {
-	private double quantile, ncp, alpha, beta, logP;
-	private final double f1, f2;
-	private final boolean isGlobalTestStatistic;
+	private ObjectProperty<Double> quantile               = new SimpleObjectProperty<Double>(this, "quantile");
+	private ObjectProperty<Double> noncentralityParameter = new SimpleObjectProperty<Double>(this, "noncentralityParameter");
+	private ObjectProperty<Double> probabilityValue       = new SimpleObjectProperty<Double>(this, "probabilityValue");
+	private ObjectProperty<Double> powerOfTest            = new SimpleObjectProperty<Double>(this, "powerOfTest");
+	private ObjectProperty<Double> logPvalue              = new SimpleObjectProperty<Double>(this, "logPvalue");
+
+	private final ReadOnlyObjectProperty<Double> f1, f2;
+	private final ReadOnlyObjectProperty<Boolean> globalTestStatistic;
 
-	public TestStatisticParameterSet(double f1, double f2, boolean isGlobalTestStatistic) {
-		this.f1 = f1;
-		this.f2 = f2;
-		this.isGlobalTestStatistic = isGlobalTestStatistic;
+	public TestStatisticParameterSet(double f1, double f2, boolean globalTestStatistic) {
+		this.f1 = new ReadOnlyObjectWrapper<Double>(this, "numeratorDof",   f1);
+		this.f2 = new ReadOnlyObjectWrapper<Double>(this, "denominatorDof", f2);
+		this.globalTestStatistic = new ReadOnlyObjectWrapper<Boolean>(this, "globalTestStatistic", globalTestStatistic);
 	}
+	
 	public TestStatisticParameterSet(double f1, double f2) {
 		this(f1, f2, Boolean.FALSE);
 	}
-	public double getQuantile() {
+	
+	public ObservableObjectValue<Double> numeratorDofProperty() {
+		return this.f1;
+	}
+
+	/**
+	 * Returns degree of freedom of numerator f1 of F distribution 
+	 * @return numerator
+	 */
+	public double getNumeratorDof() {
+		return this.f1.get();
+	}
+	
+	public ObservableObjectValue<Double> denominatorDofProperty() {
+		return this.f2;
+	}
+	
+	/**
+	 * Returns degree of freedom of denominator f2 of F distribution 
+	 * @return numerator
+	 */
+	public double getDenominatorDof() {
+		return this.f2.get();
+	}
+	
+	public ObservableObjectValue<Double> quantileProperty() {
 		return this.quantile;
 	}
+	
+	/**
+	 * Returns quantile q of F(f1,f2) distribution
+	 * @return
+	 */
+	public double getQuantile() {
+		return this.quantile.get();
+	}
+	
+	/**
+	 * Sets quantile q of F(f1,f2) distribution
+	 * @param quantile
+	 */
 	public void setQuantile(double quantile) {
-		this.quantile = quantile;
+		this.quantile.set(quantile);
+	}
+	
+	public ObservableObjectValue<Double> noncentralityParameterProperty() {
+		return this.noncentralityParameter;
 	}
+	
+	/**
+	 * Returns noncentrality parameter of F
+	 * @return noncentralityParameter
+	 */
 	public double getNoncentralityParameter() {
-		return this.ncp;
+		return this.noncentralityParameter.get();
+	}
+	
+	/**
+	 * Sets noncentrality parameter of F
+	 * @param noncentralityParameter
+	 */
+	public void setNoncentralityParameter(double noncentralityParameter) {
+		this.noncentralityParameter.set(noncentralityParameter);
 	}
-	public void setNoncentralityParameter(double ncp) {
-		this.ncp = ncp;
+	
+	public ObservableObjectValue<Double> probabilityValueProperty() {
+		return this.probabilityValue;
 	}
+	
+	/**
+	 * Returns probability value &alpha;
+	 * @return alpha
+	 */
 	public double getProbabilityValue() {
-		return this.alpha;
+		return this.probabilityValue.get();
 	}
+	
+	/**
+	 * Sets probability value &alpha;
+	 * @param alpha probability
+	 */
 	public void setProbabilityValue(double alpha) {
-		this.alpha = alpha;
+		this.probabilityValue.set(alpha);
 	}
+	
+	public ObservableObjectValue<Double> powerOfTestProperty() {
+		return this.powerOfTest;
+	}
+	
+	/**
+	 * Returns test power &beta;
+	 * @return beta
+	 */
 	public double getPowerOfTest() {
-		return this.beta;
+		return this.powerOfTest.get();
 	}
+	
+	/**
+	 * Sets test power &beta;
+	 * @return beta power
+	 */
 	public void setPowerOfTest(double beta) {
-		this.beta = beta;
+		this.powerOfTest.set(beta);
 	}
-	public double getNumeratorDof() {
-		return this.f1;
+	
+	public ObservableObjectValue<Double> logarithmicProbabilityValueProperty() {
+		return this.logPvalue;
 	}
-	public double getDenominatorDof() {
-		return this.f2;
+	
+	/**
+	 * Returns p-Value in log representation, i.e., log(p)
+	 * @return log(p)
+	 */
+	public double getLogarithmicProbabilityValue() {
+		return this.logPvalue.get();
 	}
+	
+	/**
+	 * Sets p-Value in log representation, i.e., log(p)
+	 * @param logP log(p)
+	 */
 	public void setLogarithmicProbabilityValue(double logP) {
-		this.logP = logP;
+		this.logPvalue.set(logP);
 	}
-	public double getLogarithmicProbabilityValue() {
-		return this.logP;
+	
+	public ObservableObjectValue<Boolean> globalTestStatisticProperty() {
+		return this.globalTestStatistic;
 	}
+	
+	/**
+	 * Returns true, if test statistic relates to global/family-wise test
+	 * @return familyWise
+	 */
 	public boolean isGlobalTestStatistic() {
-		return this.isGlobalTestStatistic;
+		return this.globalTestStatistic.get();
 	}
+
 	@Override
 	public String toString() {
-		return "TestStatisticParameterSet [quantile=" + quantile + ", ncp="
-				+ ncp + ", alpha=" + alpha + ", beta=" + beta + ", logP="
-				+ logP + ", f1=" + f1 + ", f2=" + f2 + "]";
+		return "TestStatisticParameterSet [quantile=" + getQuantile() + ", noncentralityParameter=" + getNoncentralityParameter()
+				+ ", probabilityValue=" + getProbabilityValue() + ", powerOfTest=" + getPowerOfTest() + ", logPvalue=" + getLogarithmicProbabilityValue()
+				+ ", d1=" + getNumeratorDof() + ", d2=" + getDenominatorDof() + ", globalTestStatistic=" + isGlobalTestStatistic() + "]";
 	}
 }