홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
603e8d9a 1 parent 2c305305

Optical related minor fixes 

Change-Id: Ic13017ce7a294b7eb55374d287173a7eef6e3259
Inline Side-by-side
Showing 5 changed files with 6 additions and 0 deletions
...@@ -78,7 +78,10 @@ public class OchSignal implements Lambda { ...@@ -78,7 +78,10 @@ public class OchSignal implements Lambda {
78 * @param channel channel number 78 * @param channel channel number
79 * @param maxFrequency maximum frequency 79 * @param maxFrequency maximum frequency
80 * @param grid grid spacing frequency 80 * @param grid grid spacing frequency
81 + *
82 + * @deprecated in Emu (ONOS 1.4).
81 */ 83 */
84 + @Deprecated
82 public OchSignal(int channel, Frequency maxFrequency, Frequency grid) { 85 public OchSignal(int channel, Frequency maxFrequency, Frequency grid) {
83 // Calculate center frequency 86 // Calculate center frequency
84 Frequency centerFrequency = maxFrequency.subtract(grid.multiply(channel - 1)); 87 Frequency centerFrequency = maxFrequency.subtract(grid.multiply(channel - 1));
...@@ -89,6 +92,7 @@ public class OchSignal implements Lambda { ...@@ -89,6 +92,7 @@ public class OchSignal implements Lambda {
89 this.slotGranularity = (int) Math.round((double) grid.asHz() / ChannelSpacing.CHL_12P5GHZ.frequency().asHz()); 92 this.slotGranularity = (int) Math.round((double) grid.asHz() / ChannelSpacing.CHL_12P5GHZ.frequency().asHz());
90 } 93 }
91 94
95 + @Deprecated
92 public OchSignal(Frequency centerFrequency, ChannelSpacing channelSpacing, int slotGranularity) { 96 public OchSignal(Frequency centerFrequency, ChannelSpacing channelSpacing, int slotGranularity) {
93 this.gridType = DEFAULT_OCH_GRIDTYPE; 97 this.gridType = DEFAULT_OCH_GRIDTYPE;
94 this.channelSpacing = channelSpacing; 98 this.channelSpacing = channelSpacing;
......
...@@ -24,6 +24,8 @@ import static com.google.common.base.Preconditions.checkNotNull; ...@@ -24,6 +24,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
24 24
25 /** 25 /**
26 * Implementation of indexed lambda criterion. 26 * Implementation of indexed lambda criterion.
27 + *
28 + * @deprecated in Emu (ONOS 1.4).
27 */ 29 */
28 @Deprecated 30 @Deprecated
29 public class IndexedLambdaCriterion implements Criterion { 31 public class IndexedLambdaCriterion implements Criterion {
......
File mode changed
File mode changed