Index: APPS/Verpakking/Optimizer.cls.xml
===================================================================
diff -u -r70083 -r70209
--- APPS/Verpakking/Optimizer.cls.xml	(.../Optimizer.cls.xml)	(revision 70083)
+++ APPS/Verpakking/Optimizer.cls.xml	(.../Optimizer.cls.xml)	(revision 70209)
@@ -106,6 +106,8 @@
 <Implementation><![CDATA[
 	If (ProductGroep = "KAD") {
 		Set BasisDoos.Swap = 0
+		Set BasisDoos.AltSwap = 0
+		
 		#dim BreedtePlanoRecept As %Decimal = BasisDoos.K1 + BasisDoos.CardBoardThickness + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Width + 5 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K1 + BasisDoos.CardBoardThickness
 		#dim DieptePlanoRecept As %Decimal = BasisDoos.Depth + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Depth + 10 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K2
 		
@@ -119,9 +121,9 @@
 		#dim DieptePlanoAltRecept As %Decimal = BasisDoos.K1 + BasisDoos.CardBoardThickness + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Depth + 5 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K1 + + BasisDoos.CardBoardThickness
 		
 		If (BreedtePlanoAltRecept > ..#AfmetingBreedsteKarton) { //Breedte grootste karton, als het te breed is wordt er geswapt -> Definitie van swap = 2
-			Set BreedtePlanoRecept =  BasisDoos.Depth + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Depth + 10 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K2
-			Set DieptePlanoRecept = BasisDoos.K1 + BasisDoos.CardBoardThickness + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Width + 5 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K1 + + BasisDoos.CardBoardThickness
-			Set BasisDoos.Swap = 1
+			Set BreedtePlanoAltRecept =  BasisDoos.Depth + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Depth + 10 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K2
+			Set DieptePlanoAltRecept = BasisDoos.K1 + BasisDoos.CardBoardThickness + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.Width + 5 + BasisDoos.Height + BasisDoos.CardBoardThickness + BasisDoos.K1 + + BasisDoos.CardBoardThickness
+			Set BasisDoos.AltSwap = 1
 		}
 		
 		#dim NodigeKartonBreedteRecept = $Select(BreedtePlanoRecept <= ..#AfmetingBreedsteKarton: ..btCardboardRepository.GeefKartonBreedte(BasisDoos.CardBoardThickness, BreedtePlanoRecept, BasisDoos.LogoPrint), 1: 9999999)
@@ -134,6 +136,7 @@
 		If ((OppTotaleKartonAltRecept < OppTotaleKartonRecept)) {
 			Set ..BreedtePlano = BreedtePlanoAltRecept
 			Set BasisDoos.Recipe = BasisDoos.AltRecipe
+			Set BasisDoos.Swap = BasisDoos.AltSwap
 		}			
 	} Else {
 		#dim SwapRecept219IsBeter, SwapRecept209IsBeter As %Boolean = $$$False
Index: vhUnitTest/APPS/Verpakking/Optimizer/Test.cls.xml
===================================================================
diff -u -r70083 -r70209
--- vhUnitTest/APPS/Verpakking/Optimizer/Test.cls.xml	(.../Test.cls.xml)	(revision 70083)
+++ vhUnitTest/APPS/Verpakking/Optimizer/Test.cls.xml	(.../Test.cls.xml)	(revision 70209)
@@ -19,47 +19,22 @@
 <Method name="TestOptmizeVouwErrondDoosKAD">
 <Implementation><![CDATA[
 	#dim ProductGroep As %String = "KAD"
-	Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New()
-	Set Doos.LogoPrint = "BLANK"
-	Set Doos.CardBoardThickness = 6.7
-	Set Doos.Swap = 2
-	Set Doos.AltSwap = 2
-	Set Doos.Width = 800
-	Set Doos.Height = 80
-	Set Doos.Depth = 200
-	Do ..AssertDoos(Doos, ProductGroep, 219, 0)
 	
-	Set Doos.Width = 600
-	Set Doos.Depth = 2100	
-	Do ..AssertDoos(Doos, ProductGroep, 209, 0)
+	Do ..AssertDoos(..GeefVouwErrondDoosKAD(1128.2, 142, 80), ProductGroep, 219, 0)
+	Do ..AssertDoos(..GeefVouwErrondDoosKAD(2089, 142, 80), ProductGroep, 209, 1)
+	Do ..AssertDoos(..GeefVouwErrondDoosKAD(2088, 142, 80), ProductGroep, 219, 0)
+	//recept 219 met swap 1 lijkt precies nooit de optimale oplossing
 ]]></Implementation>
 </Method>
 
 <Method name="TestOptmizeVouwErrondDoosTBX">
 <Implementation><![CDATA[
 	#dim ProductGroep As %String = "TBX"
-	Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New()
-	Set Doos.LogoPrint = "TBX DRAWER"
-	Set Doos.Swap = 0
-	Set Doos.Width = 1000
-	Set Doos.Height = 45
-	Set Doos.Depth = 190
-	Do ..AssertDoos(Doos, ProductGroep, 219, 0)
 	
-	Set Doos.Swap = 0
-	Set Doos.Width = 200
-	Set Doos.Depth = 500	
-	Do ..AssertDoos(Doos, ProductGroep, 219, 1)
-	
-	Set Doos.Swap = 0
-	Set Doos.Width = 200
-	Set Doos.Depth = 190	
-	Do ..AssertDoos(Doos, ProductGroep, 209, 0)
-	
-	Set Doos.Swap = 0
-	Set Doos.Width = 300
-	Set Doos.Depth = 650	
-	Do ..AssertDoos(Doos, ProductGroep, 209, 1)
+	Do ..AssertDoos(..GeefVouwErrondDoosTBX(1000, 190, 45), ProductGroep, 219, 0)
+	Do ..AssertDoos(..GeefVouwErrondDoosTBX(200, 500, 45), ProductGroep, 219, 1)
+	Do ..AssertDoos(..GeefVouwErrondDoosTBX(200, 190, 45), ProductGroep, 209, 0)	
+	Do ..AssertDoos(..GeefVouwErrondDoosTBX(150, 200, 45), ProductGroep, 209, 1)
 ]]></Implementation>
 </Method>
 
@@ -73,6 +48,39 @@
 	Do $$$AssertEquals(Doos.Swap, VerwachteSwap)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefVouwErrondDoosKAD">
+<FormalSpec>Breedte:%Decimal,Diepte:%Decimal,Hoogte:%Decimal</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Verpakking.VouwErrondDoos</ReturnType>
+<Implementation><![CDATA[
+	Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New()
+	Set Doos.LogoPrint = "BLANK"
+	Set Doos.CardBoardThickness = 6.7
+	Set Doos.Swap = 2
+	Set Doos.AltSwap = 2
+	Set Doos.Width = Breedte
+	Set Doos.Height = Hoogte
+	Set Doos.Depth = Diepte
+	
+	Quit Doos
+]]></Implementation>
+</Method>
+
+<Method name="GeefVouwErrondDoosTBX">
+<FormalSpec>Breedte:%Decimal,Diepte:%Decimal,Hoogte:%Decimal</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Verpakking.VouwErrondDoos</ReturnType>
+<Implementation><![CDATA[
+	Set Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New()
+	Set Doos.LogoPrint = "TBX DRAWER"
+	Set Doos.Width = Breedte
+	Set Doos.Height = Hoogte
+	Set Doos.Depth = Diepte
+	
+	Quit Doos
+]]></Implementation>
+</Method>
 </Class>