Merge branch 'hotfix-1.1.28'

Author: arteymix

pom.xml

@@ -5,7 +5,7 @@
 	<name>baseCode</name>
 	<groupId>baseCode</groupId>
 	<artifactId>baseCode</artifactId>
-	<version>1.1.27</version>
+	<version>1.1.28</version>
 	<inceptionYear>2003</inceptionYear>
 	<description>
 		<![CDATA[Data structures, math and statistics tools, and utilities that are often needed across projects.]]>

…ic/basecode/util/r/type/AnovaEffect.java …ecode/math/linearmodels/AnovaEffect.javasrc/ubic/basecode/util/r/type/AnovaEffect.java renamed to src/ubic/basecode/math/linearmodels/AnovaEffect.java src/ubic/basecode/util/r/type/AnovaEffect.java renamed to src/ubic/basecode/math/linearmodels/AnovaEffect.java

@@ -1,8 +1,8 @@
 /*
  * The baseCode project
- * 
+ *
  * Copyright (c) 2010 University of British Columbia
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,62 +16,50 @@
  * limitations under the License.
  *
  */
+package ubic.basecode.math.linearmodels;
 
-package ubic.basecode.util.r.type;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * Represents one row of an ANOVA table
- * 
+ *
  * @author paul
- * 
+ *
  */
 public class AnovaEffect implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Double degreesOfFreedom = null;
-
-    private String effectName = null;
-
-    private Double fStatistic = Double.NaN;
-
-    private boolean isInteraction = false;
-
-    private Double meanSq = Double.NaN;
-
-    private Double pValue = Double.NaN;
-
-    private Double ssQ = Double.NaN;
-
-    /**
-     * @param effectName
-     * @param pValue
-     * @param fStatistic
-     * @param degreesOfFreedom
-     * @param ssQ
-     * @param isInteraction
-     */
-    public AnovaEffect( String effectName, Double pValue, Double fStatistic, Double degreesOfFreedom, Double ssQ,
-            boolean isInteraction ) {
-        super();
+    private final double dof;
+    private final String effectName;
+    private final double fStat;
+    private final boolean isInteraction;
+    private final boolean isResiduals;
+    private final double meanSq;
+    private final double pValue;
+    private final double ssQ;
+
+    public AnovaEffect( String effectName, double pValue, double fStat, double dof, double ssQ, boolean isInteraction, boolean isResiduals ) {
+        if ( isResiduals && isInteraction ) {
+            throw new IllegalArgumentException( "An ANOVA effect cannot be both a residual and an interaction." );
+        }
         this.effectName = effectName;
         this.pValue = pValue;
-        this.fStatistic = fStatistic;
-        this.degreesOfFreedom = degreesOfFreedom;
+        this.fStat = fStat;
+        this.dof = dof;
         this.ssQ = ssQ;
-        this.meanSq = ssQ / degreesOfFreedom;
+        this.meanSq = ssQ / dof;
         this.isInteraction = isInteraction;
+        this.isResiduals = isResiduals;
     }
 
     /**
      * @return the degreesOfFreedom
      */
-    public Double getDegreesOfFreedom() {
-        return degreesOfFreedom;
+    public double getDof() {
+        return dof;
     }
 
     /**
@@ -84,28 +72,28 @@ public String getEffectName() {
     /**
      * @return the fStatistic
      */
-    public Double getFStatistic() {
-        return fStatistic;
+    public double getFStat() {
+        return fStat;
     }
 
     /**
      * @return the meanSq
      */
-    public Double getMeanSq() {
+    public double getMeanSq() {
         return meanSq;
     }
 
     /**
      * @return the pValue
      */
-    public Double getPValue() {
+    public double getPValue() {
         return pValue;
     }
 
     /**
      * @return the ssQ
      */
-    public Double getSsQ() {
+    public double getSsQ() {
         return ssQ;
     }
 
@@ -116,19 +104,21 @@ public boolean isInteraction() {
         return isInteraction;
     }
 
+    public boolean isResiduals() {
+        return isResiduals;
+    }
+
     @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
-        buf.append( StringUtils.rightPad( StringUtils.abbreviate( getEffectName(), 10 ), 10 ) + "\t" );
-        buf.append( String.format( "%.2f", getDegreesOfFreedom() ) + "\t" );
-        buf.append( String.format( "%.4f", getSsQ() ) + "\t" );
-        buf.append( String.format( "%.4f", getMeanSq() ) + "\t" );
-
-        if ( fStatistic != null ) {
-            buf.append( StringUtils.rightPad( String.format( "%.3f", getFStatistic() ), 6 ) + "\t" );
+        buf.append( StringUtils.rightPad( StringUtils.abbreviate( getEffectName(), 10 ), 10 ) ).append( "\t" );
+        buf.append( String.format( "%.2f", getDof() ) ).append( "\t" );
+        buf.append( String.format( "%.4f", getSsQ() ) ).append( "\t" );
+        buf.append( String.format( "%.4f", getMeanSq() ) ).append( "\t" );
+        if ( !Double.isNaN( fStat ) ) {
+            buf.append( StringUtils.rightPad( String.format( "%.3f", getFStat() ), 6 ) ).append( "\t" );
             buf.append( String.format( "%.3g", getPValue() ) );
         }
         return buf.toString();
     }
-
 }

src/ubic/basecode/math/linearmodels/AnovaResult.java

@@ -0,0 +1,37 @@
+/*
+ * The baseCode project
+ *
+ * Copyright (c) 2010 University of British Columbia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package ubic.basecode.math.linearmodels;
+
+import java.io.Serializable;
+
+public interface AnovaResult extends Serializable {
+
+    /**
+     * @return value used to track the identity of this
+     */
+    String getKey();
+
+    boolean hasResiduals();
+
+    double getResidualsDof();
+
+    double getResidualsFStat();
+
+    double getResidualsPValue();
+}