revert AdderSol

donggyukim · donggyukim · commit 23c9ba2742f2 · 2016-08-09T12:14:29.000-07:00
diff --git a/src/main/scala/solutions/Adder.scala b/src/main/scala/solutions/Adder.scala
@@ -3,7 +3,7 @@ package solutions
 
 import Chisel._
 
-class AdderSol(val w: Int) extends Module {
+class Adder(val w: Int) extends Module {
   val io = new Bundle {
     val in0 = UInt(INPUT,  w)
     val in1 = UInt(INPUT,  w)
diff --git a/src/test/scala/solutions/Adder.scala b/src/test/scala/solutions/Adder.scala
@@ -3,7 +3,7 @@ package solutions
 
 import Chisel.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
-class AdderTests(c: AdderSol) extends PeekPokeTester(c) {
+class AdderTests(c: Adder) extends PeekPokeTester(c) {
   for (i <- 0 until 10) {
     val in0 = rnd.nextInt(1 << c.w)
     val in1 = rnd.nextInt(1 << c.w)
@@ -15,10 +15,10 @@ class AdderTests(c: AdderSol) extends PeekPokeTester(c) {
 }
 
 class AdderTester extends ChiselFlatSpec {
-  behavior of "AdderSol"
+  behavior of "Adder"
   backends foreach {backend =>
     it should s"correctly add randomly generated numbers in $backend" in {
-      Driver(() => new AdderSol(16), backend)(c => new AdderTests(c)) should be (true)
+      Driver(() => new Adder(16), backend)(c => new AdderTests(c)) should be (true)
     }
   }
 }
diff --git a/src/test/scala/solutions/Launcher.scala b/src/test/scala/solutions/Launcher.scala
@@ -48,7 +48,7 @@ object Launcher {
       }
     },
     "Adder" -> { (backendName: String) =>
-      Driver(() => new AdderSol(8), backendName) {
+      Driver(() => new Adder(8), backendName) {
         (c) => new AdderTests(c)
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package solutions`
`3`	`3`
`4`	`4`	`import Chisel.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}`
`5`	`5`
`6`		`-class AdderTests(c: AdderSol) extends PeekPokeTester(c) {`
	`6`	`+class AdderTests(c: Adder) extends PeekPokeTester(c) {`
`7`	`7`	`for (i <- 0 until 10) {`
`8`	`8`	`val in0 = rnd.nextInt(1 << c.w)`
`9`	`9`	`val in1 = rnd.nextInt(1 << c.w)`
`@@ -15,10 +15,10 @@ class AdderTests(c: AdderSol) extends PeekPokeTester(c) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`class AdderTester extends ChiselFlatSpec {`
`18`		`- behavior of "AdderSol"`
	`18`	`+ behavior of "Adder"`
`19`	`19`	`backends foreach {backend =>`
`20`	`20`	`it should s"correctly add randomly generated numbers in $backend" in {`
`21`		`- Driver(() => new AdderSol(16), backend)(c => new AdderTests(c)) should be (true)`
	`21`	`+ Driver(() => new Adder(16), backend)(c => new AdderTests(c)) should be (true)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ object Launcher {`
`48`	`48`	`}`
`49`	`49`	`},`
`50`	`50`	`"Adder" -> { (backendName: String) =>`
`51`		`- Driver(() => new AdderSol(8), backendName) {`
	`51`	`+ Driver(() => new Adder(8), backendName) {`
`52`	`52`	`(c) => new AdderTests(c)`
`53`	`53`	`}`
`54`	`54`	`},`