Index: TECH/Math.cls.xml
===================================================================
diff -u -r2631 -r3163
--- TECH/Math.cls.xml	(.../Math.cls.xml)	(revision 2631)
+++ TECH/Math.cls.xml	(.../Math.cls.xml)	(revision 3163)
@@ -23,9 +23,34 @@
 
 <Method name="Floor">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Getal:%Float</FormalSpec>
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit $System.SQL.FLOOR(Getal)
+<FormalSpec>Getal:%Float,CijfersNaKomma:%Integer=0</FormalSpec>
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
+	#dim Floored As %Float
+	
+	If (Getal < 0) {
+		If (CijfersNaKomma > 0) {
+			Set Floored = $Extract(Getal,1,$Find(Getal,".")-1 + CijfersNaKomma) - (1 / 10**CijfersNaKomma)
+		} Else {
+			If (##class(TECH.StringUtils).Contains(Getal,".")) {
+				Set Floored = $Extract(Getal,1,$Find(Getal,".")-2) -1
+			} Else {
+				Set Floored = Getal
+			}
+		}
+	} Else {
+		If (CijfersNaKomma > 0) {
+			If (##class(TECH.StringUtils).Contains(Getal,".")) {
+				Set Floored = $Extract(Getal,1,$Find(Getal,".")-1 + CijfersNaKomma)
+			} Else {
+				Set Floored = Getal
+			}
+		} Else {
+			Set Floored = $Extract(Getal,1,$Find(Getal,".")-2)	
+		}
+	}
+	
+	Quit +Floored
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/TECH/Math/Floor/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Math/Floor/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Math/Floor/Test.cls.xml	(revision 3163)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.Math.Floor.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.1),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.99),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.999999),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(14.3),"14")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(14.5),"14")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(14.599),"14")
+	
+	Do $$$AssertEquals(##class(TECH.Math).Floor(-3),"-3")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(-3.99),"-4")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(-3.99999),"-4")
+	
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.1,1),".1")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.99,2),".99")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.99,1),".9")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.999999,6),".999999")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(0.999999,3),".999")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(14.3,2),"14.3")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(14.599,2),"14.59")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(55555,2),"55555")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(55555.55555,2),"55555.55")
+		
+	Do $$$AssertEquals(##class(TECH.Math).Floor(3.89,1),"3.8")
+	Do $$$AssertEquals(##class(TECH.Math).Floor(-3.89,1),"-3.9")
+	
+	Do $$$AssertEquals(##class(TECH.Math).Floor(".",2),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor("abc",2),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor("abc5",2),"0")
+	Do $$$AssertEquals(##class(TECH.Math).Floor("5abc",2),"5")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>