diff options
Diffstat (limited to 'src/main/scala/scalam')
| -rw-r--r-- | src/main/scala/scalam/DataSet.scala | 6 | ||||
| -rw-r--r-- | src/main/scala/scalam/plotting/Plot.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/scalam/plotting/styles/lines.scala | 3 | ||||
| -rw-r--r-- | src/main/scala/scalam/plotting/styles/markers.scala | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/main/scala/scalam/DataSet.scala b/src/main/scala/scalam/DataSet.scala index 99e27a3..37b15e5 100644 --- a/src/main/scala/scalam/DataSet.scala +++ b/src/main/scala/scalam/DataSet.scala @@ -1,7 +1,7 @@ package scalam import scalax.file.Path -import breeze.linalg.DenseVector +import breeze.linalg.{Vector, DenseVector} case class DataSet(val points: Seq[(Double, Double)], val name: String) { @@ -19,6 +19,6 @@ case class DataSet(val points: Seq[(Double, Double)], val name: String) { object DataSet { - def apply(x: DenseVector[Double], y: DenseVector[Double], name: String = "") = new DataSet(x.data zip y.data, name) - + def apply(x: Vector[Double], y: Vector[Double], name: String = "") = new DataSet(x.valuesIterator.toSeq zip y.valuesIterator.toSeq, name) + }
\ No newline at end of file diff --git a/src/main/scala/scalam/plotting/Plot.scala b/src/main/scala/scalam/plotting/Plot.scala index 2696f77..38a4da6 100644 --- a/src/main/scala/scalam/plotting/Plot.scala +++ b/src/main/scala/scalam/plotting/Plot.scala @@ -60,10 +60,10 @@ class Plot( commands += newFigure(figureId) commands += hold(true) commands += grid(this.grid) + commands += fontSize(this.fontSize) commands += title(this.title) commands += xLabel(this.xLabel) commands += yLabel(this.yLabel) - commands += fontSize(this.fontSize) commands ++= (for (d <- richDataSets) yield plot(d)) if (this.legend) commands ++= legend(dataSets) commands ++= wait(figureId) @@ -76,7 +76,7 @@ class Plot( "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" + "% Generated by scalam, v1.0 %\n" + - "% " + df.format(now) + " %\n" + + "% " + df.format(now) + " %\n" + "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" } diff --git a/src/main/scala/scalam/plotting/styles/lines.scala b/src/main/scala/scalam/plotting/styles/lines.scala index 187d4a9..c8c8bf3 100644 --- a/src/main/scala/scalam/plotting/styles/lines.scala +++ b/src/main/scala/scalam/plotting/styles/lines.scala @@ -9,4 +9,5 @@ trait Line extends Style { case object Solid extends Line {def expression = StringLiteral("-")} case object Dashed extends Line {def expression = StringLiteral("--")} case object Dotted extends Line {def expression = StringLiteral(":")} -case object DashDot extends Line {def expression = StringLiteral("-.")}
\ No newline at end of file +case object DashDot extends Line {def expression = StringLiteral("-.")} +case object NoLine extends Line {def expression = StringLiteral("none")}
\ No newline at end of file diff --git a/src/main/scala/scalam/plotting/styles/markers.scala b/src/main/scala/scalam/plotting/styles/markers.scala index aad7685..6c83cdb 100644 --- a/src/main/scala/scalam/plotting/styles/markers.scala +++ b/src/main/scala/scalam/plotting/styles/markers.scala @@ -19,12 +19,13 @@ case object RightTriangle extends Marker { def expression = StringLiteral(">") } case object LeftTriangle extends Marker { def expression = StringLiteral("<") } case object Pentagram extends Marker { def expression = StringLiteral("p") } case object Hexagram extends Marker { def expression = StringLiteral("h") } +case object NoMarker extends Marker { def expression = StringLiteral("none") } object AllMarkerScheme extends StyleScheme[Marker] { val markers = List(Plus, Circle, Asterisk, Point, Cross, Square, Diamond, UpTriangle, DownTriangle, RightTriangle, LeftTriangle, Pentagram, Hexagram) private def map(dataSets: Seq[DataSet]): Map[DataSet, Marker] = dataSets.zipWithIndex.map{ - case (d, i) => d -> markers(i % dataSets.length) + case (d, i) => d -> markers(i % (markers.length-1)) }.toMap override def apply(dataSets: Seq[DataSet]) = (Seq.empty[Statement], map(dataSets)) |