--- a/testing/drumb_test3.scala	Wed Nov 08 22:36:42 2017 +0000
+++ b/testing/drumb_test3.scala	Thu Nov 09 16:04:31 2017 +0000
@@ -1,32 +1,3 @@
-//println("starting test now")
-
-/*
-import scala.concurrent._
-import scala.concurrent.duration._
-import ExecutionContext.Implicits.global
-import scala.language.postfixOps 
-
-val test_data = List(List(Some(71.539941), None), List(Some(76.974614), None), 
-                     List(Some(65.226685), Some(6.35)), List(Some(78.354649), Some(12.241)), 
-                     List(Some(85.517645), Some(38.188)))
-
-val test_deltas = List(List(Some(0.07596697626574789), None), 
-                       List(Some(-0.152620823795232), None), 
-                       List(Some(0.20126676681483952), Some(0.9277165354330709)), 
-                       List(Some(0.09141762603007778), Some(2.119679764725104)))
-
-lazy val f = Future {
-  assert((yearly_yield(test_deltas, 100, 0) - 107).abs <= 2)
-  assert((yearly_yield(test_deltas, 100, 1) - 85).abs <= 2)
-  assert((yearly_yield(test_deltas, 100, 2) - 156).abs <= 2)
-  assert((yearly_yield(test_deltas, 100, 3) - 210).abs <= 2)
-  assert((investment(List("IBM", "BIDU"), 2004 to 2008, 100) - 298).abs <= 10)
-}
-
-
-Await.result(f, 180 second)
-
-*/
 
 val urban_prices = List(List(Some(311.349976), Some(27.505054)), 
 			List(Some(300.222351), Some(42.357094)), 
@@ -36,10 +7,10 @@
 assert(CW6c.yearly_yield(CW6c.get_deltas(urban_prices), 100, 0) == 125)
 
 
-val blchip_portfolio = List("GOOG", "AAPL", "MSFT", "IBM", "FB", "AMZN", "BIDU")
-val rstate_portfolio = List("PLD", "PSA", "AMT", "AIV", "AVB", "BXP", "CCI", 
-                            "DLR", "EQIX", "EQR", "ESS", "EXR", "FRT", "GGP", "HCP") 
+val urban_blchip_portfolio = List("GOOG", "AAPL", "MSFT", "IBM", "FB", "AMZN", "BIDU")
+val urban_rstate_portfolio = List("PLD", "PSA", "AMT", "AIV", "AVB", "BXP", "CCI", 
+                                  "DLR", "EQIX", "EQR", "ESS", "EXR", "FRT", "GGP", "HCP") 
 
 
-assert(CW6c.investment(rstate_portfolio, 1978 to 2017, 100) == 30839)
-assert(CW6c.investment(blchip_portfolio, 1978 to 2017, 100) == 349597)
+assert(CW6c.investment(urban_rstate_portfolio, 1978 to 2017, 100) == 30839)
+assert(CW6c.investment(urban_blchip_portfolio, 1978 to 2017, 100) == 349597)