Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9879/src/net/sourceforge/bprocessor/model
Modified Files:
Space.java Plane.java
Log Message:
Improved the energy calc to now consider if rooms are heated or not
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Space.java 21 Aug 2006 14:18:50 -0000 1.47
--- Space.java 21 Aug 2006 20:32:17 -0000 1.48
***************
*** 107,111 ****
/** The functionalspace classification options */
private String[] functionalOptions =
! {"None", "Exteriør", "Stue", "Badeværelse", "Uopvarmet rum"};
/** The modellor */
--- 107,111 ----
/** The functionalspace classification options */
private String[] functionalOptions =
! {"None", "Exteriør", "Stue", "Badeværelse", "Opvarmet rum", "Uopvarmet rum"};
/** The modellor */
Index: Plane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Plane.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Plane.java 21 Jul 2006 08:07:02 -0000 1.24
--- Plane.java 21 Aug 2006 20:32:17 -0000 1.25
***************
*** 175,180 ****
* @param direction The direction of the ray
* @return The intersection point
*/
! public Vertex intersection(Vertex origin, Vertex direction) {
double x0 = origin.getX();
double y0 = origin.getY();
--- 175,182 ----
* @param direction The direction of the ray
* @return The intersection point
+ * @param endless If the intersection should be endless
+ * or just from origin to the direction tip
*/
! public Vertex intersection(Vertex origin, Vertex direction, boolean endless) {
double x0 = origin.getX();
double y0 = origin.getY();
***************
*** 187,191 ****
double v0 = -(a * x0 + b * y0 + c * z0 + d);
double t = v0 / vd;
! if (t < -0.001 || t > 1.001) {
return null;
}
--- 189,193 ----
double v0 = -(a * x0 + b * y0 + c * z0 + d);
double t = v0 / vd;
! if (!endless && (t < -0.001 || t > 1.001)) {
return null;
}
***************
*** 224,228 ****
Vertex p1 = edge.getTo();
p1 = p1.minus(p0);
! return intersection(p0, p1);
}
--- 226,230 ----
Vertex p1 = edge.getTo();
p1 = p1.minus(p0);
! return intersection(p0, p1, false);
}
|
