Skip to content

Commit 24005eb

Browse files
committed
reorder val declarations
1 parent 6f1379e commit 24005eb

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

GridLAB-D/src/main/scala/ch/ninecode/gl/TransformerSet.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ case class TransformerSet (transformers: Array[TData])
2020
case _
2121
}
2222

23+
// get the transformer name (of the parallel transformers)
24+
val transformer_name: String =
25+
{
26+
val n = transformers.map (_.transformer.id).map (valid_config_name).sortWith (_ < _).mkString ("_")
27+
if (n.getBytes.length > 63)
28+
"_" + Math.abs (n.hashCode()) + "_" + n.substring (0, n.indexOf ("_", 32)) + "_etc"
29+
else
30+
n
31+
}
32+
2333
// primary and secondary voltage should be the same on all edges - use the first
2434
val v0: Double =
2535
{
@@ -84,16 +94,6 @@ case class TransformerSet (transformers: Array[TData])
8494
n
8595
}
8696

87-
// get the transformer name (of the parallel transformers)
88-
val transformer_name: String =
89-
{
90-
val n = transformers.map (_.transformer.id).map (valid_config_name).sortWith (_ < _).mkString ("_")
91-
if (n.getBytes.length > 63)
92-
"_" + Math.abs (n.hashCode()) + "_" + n.substring (0, n.indexOf ("_", 32)) + "_etc"
93-
else
94-
n
95-
}
96-
9797
// rated power is the sum of the powers - use low voltage side, but high voltage side is the same for simple transformer
9898
val power_rating: Double = transformers.foldLeft (0.0) ((sum, edge) => sum + edge.end1.ratedS)
9999

0 commit comments

Comments
 (0)