Commit 978d6da6 authored by Jens Korinth's avatar Jens Korinth
Browse files

Fix bug concerning empty Composition name and logfile

parent ce4de83b
...@@ -31,7 +31,7 @@ case class Composition ( ...@@ -31,7 +31,7 @@ case class Composition (
composition: Seq[Composition.Entry] composition: Seq[Composition.Entry]
) extends Description (descPath) { ) extends Description (descPath) {
def id: String = def id: String =
if ("N/A" == descPath.toString) { if ("N/A" == descPath.toString || "" == descPath.toString) {
"0x" + composition.map(_.toString).mkString("|").hashCode.toHexString "0x" + composition.map(_.toString).mkString("|").hashCode.toHexString
} else { } else {
descPath.getFileName.toString descPath.getFileName.toString
......
...@@ -29,7 +29,7 @@ class ComposeTask(composition: Composition, ...@@ -29,7 +29,7 @@ class ComposeTask(composition: Composition,
private[this] val _slurm = Slurm.enabled private[this] val _slurm = Slurm.enabled
private[this] var _composerResult: Option[Composer.Result] = None private[this] var _composerResult: Option[Composer.Result] = None
private[this] val _outDir = cfg.outputDir(composition, target, designFrequency, features getOrElse Seq()) private[this] val _outDir = cfg.outputDir(composition, target, designFrequency, features getOrElse Seq())
private[this] val _logFile = logFile getOrElse "%s/%s.log".format(_outDir, "tapasco") private[this] val _logFile = logFile getOrElse _outDir.resolve("tapasco.log").toString
private[this] val _errorLogFile = Paths.get(_logFile).resolveSibling("slurm-compose.errors.log") private[this] val _errorLogFile = Paths.get(_logFile).resolveSibling("slurm-compose.errors.log")
import LogFormatter._ import LogFormatter._
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment