oof changes for the new sdnr-configdb changes

OSDF changes required for the latest configdb api specs.
Improve performance building the minizinc request

Change-Id: I5558c96c13f3cac25d50aed61ded3ffa079df3f7
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-388

1 files changed, 13 insertions, 13 deletions

diff --git a/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn b/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn
index 19fabb9..0a9b3e3 100644
--- a/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn
+++ b/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn
@@ -28,21 +28,21 @@ int: NUM_PCIS;
 
 % Number of edges between neighbor nodes. There is a edge (i,j) if and only
 % if nodes i and j are neighbors, i.e., an user equipment (UE) can make
-% handoff between i and j. Such edges are used to avoid **CONFLICTS**, i.e.,
+% handoff between i and j. Such edges are used to avoid **COLLISIONS**, i.e.,
 % to guarantee that nodes i and j have different PCIs.
-int: NUM_CONFLICT_EDGES;
+int: NUM_NEIGHBORS;
 
 % Each line represents an edge between direct neighbors as defined before.
-array[1..NUM_CONFLICT_EDGES, 1..2] of int: CONFLICT_EDGES; 
+array[1..NUM_NEIGHBORS, 1..2] of int: NEIGHBORS;
 
 % Number of undirect neighbor pairs (j, k) such that both j and k are direct
-% neighbors of node i, i.e., (j, k) exits if and only if exists (i, j) and 
+% neighbors of node i, i.e., (j, k) exits if and only if exists (i, j) and
 % (i, k). Nodes (i, k) can generate "confunsions" in the network if they have
 % the same PCI. Such edges are used to avoid/minimize **CONFUSIONS**.
-int: NUM_CONFUSION_EDGES;
+int: NUM_SECOND_LEVEL_NEIGHBORS;
 
 % Each line represents an edge between undirect neighbors as defined before.
-array[1..NUM_CONFUSION_EDGES, 1..2] of int: CONFUSION_EDGES; 
+array[1..NUM_SECOND_LEVEL_NEIGHBORS, 1..2] of int: SECOND_LEVEL_NEIGHBORS;
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Decision variables
@@ -55,16 +55,16 @@ array[0..NUM_NODES-1] of var 0..NUM_PCIS-1: pci;
 % Constraints
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% Direct neighbors must have different PCIs for avoid **CONFLICTS**.
-constraint 
-forall(i in 1..NUM_CONFLICT_EDGES)(
-    pci[CONFLICT_EDGES[i, 1]] != pci[CONFLICT_EDGES[i, 2]]
+% Direct neighbors must have different PCIs for avoid **COLLISION**.
+constraint
+forall(i in 1..NUM_NEIGHBORS)(
+    pci[NEIGHBORS[i, 1]] != pci[NEIGHBORS[i, 2]]
 );
 
 % Undirect neighbors must have different PCIs for avoid **CONFUSIONS**.
-constraint 
-forall(i in 1..NUM_CONFUSION_EDGES)(
-    pci[CONFUSION_EDGES[i, 1]] != pci[CONFUSION_EDGES[i, 2]]
+constraint
+forall(i in 1..NUM_SECOND_LEVEL_NEIGHBORS)(
+    pci[SECOND_LEVEL_NEIGHBORS[i, 1]] != pci[SECOND_LEVEL_NEIGHBORS[i, 2]]
 );
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%