1. Boundary conditions check

2. Function order changes 3. Material naming condition changes
BIMDataHub · Jun 23, 2016 · 91a3178 · 91a3178
1 parent 041565d
commit 91a3178
Show file tree

Hide file tree

Showing 3 changed files with 467 additions and 539 deletions.
diff --git a/src/org/bimserver/osm/serializer/OsmMaterial.java b/src/org/bimserver/osm/serializer/OsmMaterial.java
@@ -31,7 +31,15 @@ public OsmMaterial(String name, String roughness, double thickness, double condu
 		this.handle       = UUID.randomUUID().toString();
 		this.name         = name;
 		this.roughness    = "MediumRough";
-		this.thickness    = Double.compare(thickness, 3.0) < 0 ? thickness : 3.0;
+
+		if (Double.compare(thickness, 0.0) > 0 && Double.compare(thickness, 3.0) < 0) {
+			this.thickness = thickness;
+		} else if (Double.compare(thickness, 0.0) <= 0) {
+			this.thickness = 0.001;
+		} else if (Double.compare(thickness, 3.0) >= 0) {
+			this.thickness = 3.0;
+		}
+
 		this.conductivity = Double.compare(conductivity, 0.0) > 0 ? conductivity : 0.001;
 		this.density      = Double.compare(density, 0.0) > 0 ? density : 0.001;
 		this.specificHeat = Double.compare(specificHeat, 0.0) > 0 ? specificHeat : 0.001;