[Falcon] Pretty print OchSignal

Change-Id: Ic0ecc88c95faf91397e132087a1ea0b1fa7295d5

[Falcon] Pretty print OchSignal
Change-Id: Ic0ecc88c95faf91397e132087a1ea0b1fa7295d5
Naoki Shiota · Gerrit Code Review
Commit 0b5ccd2bb57296988affb91bc612d8473f7dfb98 0b5ccd2b 1 parent 78acc446
Showing 1 changed file with 7 additions and 7 deletions
core/api/src/main/java/org/onosproject/net/OchSignal.java
--- a/core/api/src/main/java/org/onosproject/net/OchSignal.java
View file @0b5ccd2
+++ b/core/api/src/main/java/org/onosproject/net/OchSignal.java
View file @0b5ccd2
@@ -15,7 +15,6 @@
  */
 package org.onosproject.net;
-import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import org.onlab.util.Frequency;
 import org.onlab.util.Spectrum;
@@ -251,11 +250,12 @@ public class OchSignal implements Lambda {
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
+        return String.format("%s{%+d×%.2fGHz ± %.2fGHz}",
-                .add("gridType", gridType)
+                this.getClass().getSimpleName(),
-                .add("channelSpacing", channelSpacing)
+                spacingMultiplier,
-                .add("spacingMultiplier", spacingMultiplier)
+                (double) slotGranularity * channelSpacing.frequency().asHz()
-                .add("slotGranularity", slotGranularity)
+                        / Frequency.ofGHz(1).asHz(),
-                .toString();
+                (double) slotGranularity * ChannelSpacing.CHL_12P5GHZ.frequency().asHz()
+                        / Frequency.ofGHz(1).asHz() / 2.0);
     }
 }