[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.174, 1.175 EnergyCalc.java, 1.11, 1.12

[rimestad <rim...@us...>]

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

Modified Files:
	Surface.java EnergyCalc.java 
Log Message:
Made energy calc work, made some minor tests which seems to work

Index: EnergyCalc.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/EnergyCalc.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** EnergyCalc.java	13 Aug 2007 11:41:25 -0000	1.11
--- EnergyCalc.java	19 Sep 2007 09:28:22 -0000	1.12
***************
*** 74,78 ****
        Attribute a = classification.getParameter("uvalue");
        if (a != null && a.getValue() != null) {
!         loss = (Double)classification.getParameter("uvalue").getValue() * current.getArea();
        } else {
          log.warn("uvalue for " + classification + " through " + current + " were't there");
--- 74,78 ----
        Attribute a = classification.getParameter("uvalue");
        if (a != null && a.getValue() != null) {
!         loss = (Double)classification.getParameter("uvalue").getValue() * 1000 * current.getArea();
        } else {
          log.warn("uvalue for " + classification + " through " + current + " were't there");

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** Surface.java	7 Sep 2007 13:21:14 -0000	1.174
--- Surface.java	19 Sep 2007 09:28:22 -0000	1.175
***************
*** 1409,1414 ****
          firstx = thisx;
          firsty = thisy;
-         prevx = thisx;
-         prevy = thisy;
          first = false;
        } else {
--- 1409,1412 ----