Merge pull request #59 from DanielaSfregola/#58_lazy_evaluation

#58 Using lazy evaluation
DanielaSfregola · Apr 16, 2018 · aa7fcbc · aa7fcbc
2 parents 7d35219 + d83cc3f
commit aa7fcbc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/scala/com/danielasfregola/randomdatagenerator/RandomDataGenerator.scala b/src/main/scala/com/danielasfregola/randomdatagenerator/RandomDataGenerator.scala
@@ -4,6 +4,7 @@ import com.danielasfregola.randomdatagenerator.utils.{SeedDetector, ShapelessLik
 import org.scalacheck._
 
 import scala.reflect.runtime.universe._
+import scala.util.{Success, Try}
 
 object RandomDataGenerator extends RandomDataGenerator
 
@@ -14,9 +15,11 @@ trait RandomDataGenerator extends ShapelessLike {
   def random[T: WeakTypeTag: Arbitrary]: T = random(1).head
 
   def random[T: WeakTypeTag: Arbitrary](n: Int): Seq[T] = {
-    val gen = Gen.listOfN(n, implicitly[Arbitrary[T]].arbitrary)
-    val optSeqT = gen.apply(Gen.Parameters.default, seed)
-    optSeqT.getOrElse(explode)
+    val gen = Gen.infiniteStream(implicitly[Arbitrary[T]].arbitrary)
+    Try(gen.apply(Gen.Parameters.default, seed)) match {
+      case Success(Some(v)) => v.take(n)
+      case _                => explode[T]
+    }
   }
 
   private def explode[T: WeakTypeTag]() = {