[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model EnergyCalc.java, 1.7, 1.8

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3899/src/net/sourceforge/bprocessor/model

Modified Files:
	EnergyCalc.java 
Log Message:
Updated energy calc to the new calculation system using the attributes of DBK classifications etc

Index: EnergyCalc.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/EnergyCalc.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EnergyCalc.java	20 Mar 2007 09:46:14 -0000	1.7
--- EnergyCalc.java	29 Mar 2007 22:00:12 -0000	1.8
***************
*** 43,46 ****
--- 43,47 ----
        }
      }
+     totalloss = 0.024 * 3680 * totalloss;
      int i = (int) (totalloss * 1000);
      totalloss = ((double) i) / 1000;
***************
*** 64,85 ****
            
            if (classification.getClassification().getFullId(null).equalsIgnoreCase("-210.01")) {
!             loss = 0.15 * current.getArea();
              return loss;
            }
            if (classification.getClassification().getFullId(null).equalsIgnoreCase("-215.01") || 
                classification.getClassification().getFullId(null).equalsIgnoreCase("-215")) {
!             loss = 0.15 * current.getArea();
              return loss;
            }
            if (classification.getClassification().getFullId(null).equalsIgnoreCase("-215.04")) {
!             loss = 0.15 * current.getArea();
              return loss;
            }
!           if (classification.getClassification().getFullId(null).equalsIgnoreCase("-205") ||
!               classification.getClassification().getFullId(null).equalsIgnoreCase("-205.01")) {
!             loss = 0.25 * current.getArea();
              return loss;
            }
!           if (classification.getClassification().getName().equalsIgnoreCase("Ældre termovindue")) {
              loss = 2.5 * current.getArea();
              return loss;
--- 65,93 ----
            
            if (classification.getClassification().getFullId(null).equalsIgnoreCase("-210.01")) {
!             loss = classification.getClassification().getUvalue() * current.getArea();
!             //loss = 0.15 * current.getArea();
              return loss;
            }
            if (classification.getClassification().getFullId(null).equalsIgnoreCase("-215.01") || 
                classification.getClassification().getFullId(null).equalsIgnoreCase("-215")) {
!             loss = classification.getClassification().getUvalue() * current.getArea();
!             //loss = 0.15 * current.getArea();
              return loss;
            }
            if (classification.getClassification().getFullId(null).equalsIgnoreCase("-215.04")) {
!             loss = classification.getClassification().getUvalue() * current.getArea();
!             //loss = 0.15 * current.getArea();
              return loss;
            }
!           if (classification.getClassification().getFullId(null).equalsIgnoreCase("-205")) {
!             loss = classification.getClassification().getUvalue() * current.getArea();
!             //loss = 0.25 * current.getArea();
              return loss;
            }
!           if (classification.getClassification().getFullId(null).equalsIgnoreCase("-205.01")) {
!             loss = classification.getClassification().getUvalue() * current.getArea();
!             return loss;
!           }
!           if (classification.getClassification().getName().equalsIgnoreCase("termovindue")) {
              loss = 2.5 * current.getArea();
              return loss;
***************
*** 93,97 ****
            if (classification.getClassification().
                getFullId(null).equalsIgnoreCase("-205.02")) {
!             loss = 0.8 * current.getArea();
              return loss;
            }
--- 101,106 ----
            if (classification.getClassification().
                getFullId(null).equalsIgnoreCase("-205.02")) {
!             loss = classification.getClassification().getUvalue() * current.getArea();
!             //loss = 0.8 * current.getArea();
              return loss;
            }
***************
*** 148,151 ****
--- 157,162 ----
      }
      
+     
+     
     
      if (closest != null && closest.getFrontDomain().isFunctionalSpace()) {
***************
*** 156,159 ****
--- 167,172 ----
      }
      
+     
+  
      if (spa != null) {
        if (spa.getClassification() != null) {