pascal/scim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mod] modified output and config

Browse Source 
- output parent display now shows all parent types
 - sensor count in config block is now a multiple of the cells
This commit is contained in:
Pascal
2020-01-29 01:19:11 -06:00
parent b61dbaa266
commit b427ca2233
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/wiki/config/config_preview.yml
View File

@@ -22,7 +22,7 @@ sensors:
blocks: blocks:
- start: [0, 4] - start: [0, 4]
end: [6, 6] end: [6, 6]
count: 180 count: 210
- group: faultyTemp - group: faultyTemp
parent: temperature parent: temperature
@@ -48,7 +48,7 @@ groundtruths:
- start: 0 - start: 0
end: 7 end: 7
- [18, 24] - [18, 24]
- [7, 10.0] - [7, 10]
- [12, 16.0] - [12, 16.0]
delta: delta:
- name: fluctuate - name: fluctuate
@@ -58,7 +58,7 @@ groundtruths:
- [12, 16] - [12, 16]
- [18, 24] - [18, 24]
- [7, change, {range: 0.0, target: 16.0, targetTime: 12, center: [3, 3], distOffset: -0.5, time:[7]}] - [7, change, {range: 0.0, target: 16.0, targetTime: 12, center: [3, 3], distOffset: -0.5, time:[7]}]
- [16, change, {range: 0.0, target: 10.0, targetTime: 18, center: [3, 3], distOffset: -0.5, time:[16]}] - [16, change, {range: 0.0, target: 10.0, targetTime: 18, center: [3, 3], distOffset: -0.5, time:[]}]
- group: temperature - group: temperature
parent: baseline parent: baseline

3
src/main/scala/scim/components/Output.scala
View File

@@ -23,7 +23,8 @@ class Output(sharedMemory: SharedMemory, printOutput: Boolean = true) extends Ru
cells._2.foreach(groups => { cells._2.foreach(groups => {
val group = groups._1 val group = groups._1
val lastElement = groups._2.lastOption val lastElement = groups._2.lastOption
print(BLUE(" Group: ") + group + (if(!lastElement.isEmpty) MAGENTA("\n Results: ") else "")) print(BLUE(" Group: ") + group.name + (if(!group.parent.isEmpty) BLUE( " Parent: ") + group.parent.get else ""))
print(if(!lastElement.isEmpty) MAGENTA("\n Results: ") else "")
groups._2.foreach(res => print(res.get._3.getOrElse("None") + (if(res.eq(lastElement.get)) "" else " | "))) groups._2.foreach(res => print(res.get._3.getOrElse("None") + (if(res.eq(lastElement.get)) "" else " | ")))
if(groundTruths.contains(cell) && groundTruths(cell).contains(group)) print(GREEN("\n Ground Truth: ") + groundTruths(cell)(group).peak().getOrElse("None")) if(groundTruths.contains(cell) && groundTruths(cell).contains(group)) print(GREEN("\n Ground Truth: ") + groundTruths(cell)(group).peak().getOrElse("None"))
print("\n") print("\n")