diff options
author | Jakob Odersky <jodersky@gmail.com> | 2012-10-30 21:48:46 +0100 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2012-10-30 21:48:46 +0100 |
commit | a93a86db7ad1839605448f9532ac96300785a59e (patch) | |
tree | b45a754e99ff093b324353d2e0be412df6182d51 /src/main/scala | |
parent | 215fbe731743e8f38a3a62cb1b83ab03ae32f6b6 (diff) | |
download | scalam-a93a86db7ad1839605448f9532ac96300785a59e.tar.gz scalam-a93a86db7ad1839605448f9532ac96300785a59e.tar.bz2 scalam-a93a86db7ad1839605448f9532ac96300785a59e.zip |
move interpreters to seperate package
Diffstat (limited to 'src/main/scala')
-rw-r--r-- | src/main/scala/scalam/m/interpretation/Interpreter.scala (renamed from src/main/scala/scalam/m/Interpreter.scala) | 2 | ||||
-rw-r--r-- | src/main/scala/scalam/m/interpretation/MInterpreter.scala (renamed from src/main/scala/scalam/m/MatlabInterpreter.scala) | 12 | ||||
-rw-r--r-- | src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala | 8 | ||||
-rw-r--r-- | src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala | 9 | ||||
-rw-r--r-- | src/main/scala/scalam/plotting/Plotter.scala | 4 |
5 files changed, 27 insertions, 8 deletions
diff --git a/src/main/scala/scalam/m/Interpreter.scala b/src/main/scala/scalam/m/interpretation/Interpreter.scala index b4be651..93411c3 100644 --- a/src/main/scala/scalam/m/Interpreter.scala +++ b/src/main/scala/scalam/m/interpretation/Interpreter.scala @@ -1,4 +1,4 @@ -package scalam.m +package scalam.m.interpretation import scalax.file.Path import scala.sys.process._ diff --git a/src/main/scala/scalam/m/MatlabInterpreter.scala b/src/main/scala/scalam/m/interpretation/MInterpreter.scala index 2b055e2..b154cd7 100644 --- a/src/main/scala/scalam/m/MatlabInterpreter.scala +++ b/src/main/scala/scalam/m/interpretation/MInterpreter.scala @@ -1,18 +1,18 @@ -package scalam.m +package scalam +package m +package interpretation import ast._ import scalax.file.Path -class MatlabInterpreter(pwd: Path) extends Interpreter("matlab -nosplash -nodesktop", pwd) { +class MInterpreter(command: String, pwd: Path) extends Interpreter(command, pwd){ + def evaluate(root: ast.Root) = write(root.line + "\n") + def exit() = { val cmd = Function(Identifier("exit")) evaluate(cmd) super.close() } - -} -object MatlabInterpreter { - final val command = "matlab -nosplash -nodesktop" }
\ No newline at end of file diff --git a/src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala b/src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala new file mode 100644 index 0000000..34534e6 --- /dev/null +++ b/src/main/scala/scalam/m/interpretation/MatlabInterpreter.scala @@ -0,0 +1,8 @@ +package scalam +package m +package interpretation + +import ast._ +import scalax.file.Path + +class MatlabInterpreter(pwd: Path) extends MInterpreter("matlab -nosplash -nodesktop", pwd)
\ No newline at end of file diff --git a/src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala b/src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala new file mode 100644 index 0000000..c55166b --- /dev/null +++ b/src/main/scala/scalam/m/interpretation/OctaveInterpreter.scala @@ -0,0 +1,9 @@ +package scalam +package m +package interpretation + +import ast._ +import scalax.file.Path + + +class OctaveInterpreter(pwd: Path) extends MInterpreter("octave", pwd)
\ No newline at end of file diff --git a/src/main/scala/scalam/plotting/Plotter.scala b/src/main/scala/scalam/plotting/Plotter.scala index 46e579f..341b976 100644 --- a/src/main/scala/scalam/plotting/Plotter.scala +++ b/src/main/scala/scalam/plotting/Plotter.scala @@ -3,13 +3,15 @@ package scalam.plotting import scalam.m._ import scalam.m.ast._ import scalam.plotting.styles._ +import scalam.m.interpretation.MInterpreter +import scalam.m.interpretation.MatlabInterpreter trait Plotter { import Plotter._ val pwd: scalax.file.Path - lazy val interpreter = new MatlabInterpreter(pwd) + lazy val interpreter: MInterpreter = new MatlabInterpreter(pwd) def plot(dataSets: Seq[DataSet], title: String, x: String, y: String, grid: Boolean = true, legend: Boolean = true)(implicit styles: Seq[Style[_]] = defaultStyles, fontSize: FontSize = defaultFontSize) = { val p = new Plot(dataSets, title, x, y, grid, legend, styles = styles, fontSize = fontSize.fontSize) |