added unittests for dcpf sensitivities, also added sens_i_mag_u_bound for branches, (not used yet)

ttinoco · ttinoco · commit 1554aeaa7696 · 2017-10-18T10:25:34.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@ Version 1.3.2
 * Fixed bug with treatment of outage branches in PV-PQ switching heuristics.
 * Added arrays branch_outages and generator_outages to contingency object to store indices of outage components.
 * Added unittests to check that examples run without errors.
+* Extended support for storing and retrieving constraint sensitivity information (done).
 * Update Python wrapper documentation to show how to install with pip or download/run tests (todo).
 * Update examples, documentation (macros, intersphinx) and create release (todo).
 * Distribute pfnet python wrapper through pypi (todo).
diff --git a/include/pfnet/branch.h b/include/pfnet/branch.h
@@ -100,6 +100,7 @@ REAL BRANCH_get_sens_ratio_u_bound(Branch* br, int t);
 REAL BRANCH_get_sens_ratio_l_bound(Branch* br, int t);
 REAL BRANCH_get_sens_phase_u_bound(Branch* br, int t);
 REAL BRANCH_get_sens_phase_l_bound(Branch* br, int t);
+REAL BRANCH_get_sens_i_mag_u_bound(Branch* br, int t);
 int BRANCH_get_index(Branch* br);
 int BRANCH_get_index_ratio(Branch* br, int t);
 int BRANCH_get_index_phase(Branch* br, int t);
@@ -183,6 +184,7 @@ void BRANCH_set_sens_ratio_u_bound(Branch* br, REAL value, int t);
 void BRANCH_set_sens_ratio_l_bound(Branch* br, REAL value, int t);
 void BRANCH_set_sens_phase_u_bound(Branch* br, REAL value, int t);
 void BRANCH_set_sens_phase_l_bound(Branch* br, REAL value, int t);
+void BRANCH_set_sens_i_mag_u_bound(Branch* br, REAL value, int t);
 void BRANCH_set_index(Branch* br, int index);
 void BRANCH_set_type(Branch* br, int type);
 void BRANCH_set_bus_k(Branch* br, Bus* bus_k);
diff --git a/python/lib/pfnet-1.3.2.tar.gz b/python/lib/pfnet-1.3.2.tar.gz
diff --git a/python/tests/test_constraints.py b/python/tests/test_constraints.py
@@ -3434,6 +3434,25 @@ def test_constr_DCPF(self):
                         mis -= br.P_mk_DC[t]
                     self.assertLess(np.abs(mismatches1[bus.index+t*net.num_buses]-mis),1e-8)
 
+            # Sensitivities
+            net.clear_sensitivities()
+
+            lam = np.random.randn(net.num_buses*net.num_periods)
+            self.assertEqual(lam.size, constr.A.shape[0])
+
+            for t in range(net.num_periods):
+                for bus in net.buses:
+                    self.assertEqual(bus.sens_P_balance[t], 0.)
+                    self.assertEqual(bus.sens_Q_balance[t], 0.)
+
+            constr.store_sensitivities(lam, None, None, None)
+
+            for t in range(net.num_periods):
+                for bus in net.buses:
+                    self.assertEqual(bus.sens_P_balance[t], lam[bus.index+t*net.num_buses])
+                    self.assertNotEqual(bus.sens_P_balance[t], 0.)
+                    self.assertEqual(bus.sens_Q_balance[t], 0.)
+
     def test_constr_DC_FLOW_LIM(self):
 
         # Single period
diff --git a/src/net/branch.c b/src/net/branch.c
@@ -80,6 +80,7 @@ struct Branch {
   REAL* sens_ratio_l_bound; /**< @brief Sensitivity of tap ratio lower bound */
   REAL* sens_phase_u_bound; /**< @brief Sensitivity of phase shift upper bound */
   REAL* sens_phase_l_bound; /**< @brief Sensitivity of phase shift lower bound */
+  REAL* sens_i_mag_u_bound; /**< @brief Sensitivity of current magnitude upper bound */
 
   // List
   Branch* reg_next;   /**< @brief List of branches regulating a bus voltage magnitude */
@@ -110,6 +111,7 @@ void BRANCH_array_del(Branch* br_array, int size) {
       free(br->sens_ratio_l_bound);
       free(br->sens_phase_u_bound);
       free(br->sens_phase_l_bound);
+      free(br->sens_i_mag_u_bound);
     }
     free(br_array);
   }
@@ -161,6 +163,7 @@ void BRANCH_clear_sensitivities(Branch* br) {
       br->sens_ratio_l_bound[t] = 0;
       br->sens_phase_u_bound[t] = 0;
       br->sens_phase_l_bound[t] = 0;
+      br->sens_i_mag_u_bound[t] = 0;
     }
   }
 }
@@ -242,6 +245,7 @@ void BRANCH_copy_from_branch(Branch* br, Branch* other) {
   memcpy(br->sens_ratio_l_bound,other->sens_ratio_l_bound,num_periods*sizeof(REAL));
   memcpy(br->sens_phase_u_bound,other->sens_phase_u_bound,num_periods*sizeof(REAL));
   memcpy(br->sens_phase_l_bound,other->sens_phase_l_bound,num_periods*sizeof(REAL));
+  memcpy(br->sens_i_mag_u_bound,other->sens_i_mag_u_bound,num_periods*sizeof(REAL));
   
   // List
   // skip next
@@ -345,6 +349,13 @@ REAL BRANCH_get_sens_phase_l_bound(Branch* br, int t) {
     return 0;
 }
 
+REAL BRANCH_get_sens_i_mag_u_bound(Branch* br, int t) {
+  if (br && t >= 0 && t < br->num_periods)
+    return br->sens_i_mag_u_bound[t];
+  else
+    return 0;
+}
+
 int BRANCH_get_index(Branch* br) {
   if (br)
     return br->index;
@@ -1281,6 +1292,7 @@ void BRANCH_init(Branch* br, int num_periods) {
   ARRAY_zalloc(br->sens_ratio_l_bound,REAL,T);
   ARRAY_zalloc(br->sens_phase_u_bound,REAL,T);
   ARRAY_zalloc(br->sens_phase_l_bound,REAL,T);
+  ARRAY_zalloc(br->sens_i_mag_u_bound,REAL,T);
 
   for (t = 0; t < br->num_periods; t++)
     br->ratio[t] = 1.;
@@ -1436,6 +1448,11 @@ void BRANCH_set_sens_phase_l_bound(Branch* br, REAL value, int t) {
     br->sens_phase_l_bound[t] = value;
 }
 
+void BRANCH_set_sens_i_mag_u_bound(Branch* br, REAL value, int t) {
+  if (br && t >= 0 && t < br->num_periods)
+    br->sens_i_mag_u_bound[t] = value;
+}
+
 void BRANCH_set_index(Branch* br, int index) {
   if (br)
     br->index = index;
