Merge pull request #124 from msakai/feature/wbo2ipinfo-no-weights

Change WBO2IPInfo not to store weights
msakai · Nov 26, 2024 · 79456f7 · 79456f7
2 parents 2148879 + 14a1d2e
commit 79456f7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ToySolver/Converter/PB2IP.hs b/src/ToySolver/Converter/PB2IP.hs
@@ -94,7 +94,7 @@ convVar x = MIP.toVar ("x" ++ show x)
 
 -- -----------------------------------------------------------------------------
 
-data WBO2IPInfo = WBO2IPInfo !Int [(MIP.Var, PBFile.SoftConstraint)]
+data WBO2IPInfo = WBO2IPInfo !Int [(MIP.Var, PBFile.Constraint)]
   deriving (Eq, Show)
 
 instance Transformer WBO2IPInfo where
@@ -105,13 +105,13 @@ instance ForwardTransformer WBO2IPInfo where
   transformForward (WBO2IPInfo _nv relaxVariables) m = Map.union m1 m2
       where
         m1 = Map.fromList $ [(convVar v, if val then 1 else 0) | (v,val) <- assocs m]
-        m2 = Map.fromList $ [(v, if SAT.evalPBConstraint m c then 0 else 1) | (v, (Just _, c)) <- relaxVariables]
+        m2 = Map.fromList $ [(v, if SAT.evalPBConstraint m c then 0 else 1) | (v, c) <- relaxVariables]
 
 instance BackwardTransformer WBO2IPInfo where
   transformBackward (WBO2IPInfo nv _relaxVariables) = mtrans nv
 
 wbo2ip :: Bool -> PBFile.SoftFormula -> (MIP.Problem Integer, WBO2IPInfo)
-wbo2ip useIndicator formula = (mip, WBO2IPInfo (PBFile.wboNumVars formula) relaxVariables)
+wbo2ip useIndicator formula = (mip, WBO2IPInfo (PBFile.wboNumVars formula) [(r, c) | (r, (Just _, c)) <- relaxVariables])
   where
     mip = def
       { MIP.objectiveFunction = obj2