Added transformerPairing algo w distance + removed a print statement …

…in utils
dpinney · Feb 15, 2024 · 3d73869 · 3d73869
1 parent c8e0690
commit 3d73869
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/omf/solvers/sdsmc/MeterTransformerPairing/M2TUtils.py b/omf/solvers/sdsmc/MeterTransformerPairing/M2TUtils.py
@@ -514,8 +514,8 @@ def ParamEst_LinearRegression_NoQ(voltage,p,savePath=-1):
     # Walk through each customer pairing and do the regression, note that the 
     #resulting matrices are mirrored across the diagonal
     for custCtr in range(0,voltage.shape[1]):
-        if np.mod(custCtr,20) == 0:
-            print('Customer ' + str(custCtr) + '/' + str(voltage.shape[1]))
+        #if np.mod(custCtr,20) == 0:
+            # print('Customer ' + str(custCtr) + '/' + str(voltage.shape[1]))
         ctr = custCtr + 1
         while ctr < voltage.shape[1]:
             #print(str(custCtr) + ' / ' + str(ctr))

diff --git a/omf/solvers/sdsmc/MeterTransformerPairing/TransformerPairingWithDist.py b/omf/solvers/sdsmc/MeterTransformerPairing/TransformerPairingWithDist.py
@@ -207,19 +207,17 @@ def run( voltageData_AMI: str, realPowerData_AMI: str, customerIDs_AMI: str, tra
         df.to_csv(Path(saveResultsPath,filename), index=False) # Modified
         # print('Predicted Transformer labels written to outputsAll_M2T_NoQ.csv')
 
-
     df = pd.DataFrame()
     df['Ranked Flagged Transformers'] = flaggedTrans
     df.to_csv(Path(saveResultsPath,'outputs_RankedFlaggedTransformers.csv'))
     # print('Flagged and ranked transformers written to outputs_RankedFlaggedTransformers.csv')
 
-
     changedIndices = np.where(predictedTransLabels != transLabelsErrors)[1]
     df = pd.DataFrame()
     df['customer ID'] = list(np.array(custIDInput)[changedIndices])
     df['Original Transformer Labels (with Errors)'] = transLabelsErrors[0,changedIndices]
     df['Predicted Transformer Labels'] = predictedTransLabels[0,changedIndices]
-    filename = 'outputs_ChangedCustomers_M2T_NoQ.csv'
+    filename = 'outputs_ChangedCustomers_M2T.csv'
     df.to_csv(Path(saveResultsPath,filename), index=False) # Modified
     # print('All customers with changed transformer labels written to ChangedCustomers_M2T_NoQ.csv')
 

diff --git a/omf/solvers/sdsmc/MeterTransformerPairing/__init__.py b/omf/solvers/sdsmc/MeterTransformerPairing/__init__.py
@@ -1,4 +1,6 @@
 if __package__ in [None, '']:
     import TransformerPairing
+    import TransformerPairingWithDist
 else:
-    from . import TransformerPairing
+    from . import TransformerPairing
+    from . import TransformerPairingWithDist