diff --git a/bin/LagrangianRelaxation.linux.x86_64.gnu.opt.spx2 b/bin/LagrangianRelaxation.linux.x86_64.gnu.opt.spx2 index 78b70636c1b7ccdd04a3104a15948388e1fdd563..d6e0189acdfcd9bfd4ede9f9bc22480bf1be37d2 100755 Binary files a/bin/LagrangianRelaxation.linux.x86_64.gnu.opt.spx2 and b/bin/LagrangianRelaxation.linux.x86_64.gnu.opt.spx2 differ diff --git a/obj/static/O.linux.x86_64.gnu.opt/relax_lagr.o b/obj/static/O.linux.x86_64.gnu.opt/relax_lagr.o index 488dc0094efa497cf426fd723dbdb2e3788ca28a..fcd138f8fbd659a3e0ba26405738bf29074ea9aa 100644 Binary files a/obj/static/O.linux.x86_64.gnu.opt/relax_lagr.o and b/obj/static/O.linux.x86_64.gnu.opt/relax_lagr.o differ diff --git a/src/relax_lagr.cpp b/src/relax_lagr.cpp index fe8f9da36b424c479b353640f6c242895dcf11f4..b205be991a32e0c7f1852bf2b67fe7ed9bb7a467 100644 --- a/src/relax_lagr.cpp +++ b/src/relax_lagr.cpp @@ -364,14 +364,14 @@ SCIP_DECL_RELAXINIT(relaxInitlagr) SCIP_CALL(SCIPgetConsNVars(relaxscip, cons, &nconsvars, &valid)); SCIP_CALL(SCIPgetConsVars(relaxscip, cons, VARSinsidegoodconss, nconsvars, &valid)); if (!valid){abort(); } - printf("\n %s\t",SCIPconsGetName(cons)); + //printf("\n %s\t",SCIPconsGetName(cons)); for (int j = 0; j < nconsvars; ++j) /* (8) */ { SCIP_VAR* varx = (VARSinsidegoodconss)[j]; - printf("%s\t",SCIPvarGetName(varx)); + //printf("%s\t",SCIPvarGetName(varx)); int varbufindex = SCIPvarGetIndex(varx); //get the index, which will be used in assigning values to the feassol. assert(varbufindex != NULL); - printf("%d\t",varbufindex); + //printf("%d\t",varbufindex); @@ -389,7 +389,7 @@ SCIP_DECL_RELAXINIT(relaxInitlagr) int* varids = SCIPvardataGetvarids(vardata); assert(varids=!NULL); int NVarInBadConss = SCIPvardataGetNVarInBadConss(vardata); - printf("nvarincons = %d\t",NVarInBadConss); + //printf("nvarincons = %d\t",NVarInBadConss); for(int t=0;t<NVarInBadConss;t++) { printf("%d \n",varids[t]); @@ -399,8 +399,8 @@ SCIP_DECL_RELAXINIT(relaxInitlagr) if(SCIPvarGetIndex(vars[listconsvarids[p]])!=varbufindex) { - printf("var = %s\t",SCIPvarGetName(vars[listconsvarids[p]])); - if(feasol[listconsvarids[p]]!=1) + // printf("var = %s\t",SCIPvarGetName(vars[listconsvarids[p]])); + if(feasol[listconsvarids[p]]==-1) { feasol[listconsvarids[p]]=0; } @@ -421,13 +421,14 @@ SCIP_DECL_RELAXINIT(relaxInitlagr) } - + SCIP_Real upperbound=0; for(int v=0;v<nvars;v++) { - printf(" %d ",feasol[v]); + printf(" (%s %d weight %f) \n ", SCIPvarGetName(vars[v]),feasol[v], weights[v]); + upperbound+=(feasol[v]*SCIPvarGetObj(vars[v])); } - + printf("upper bound = %f", upperbound); diff --git a/time.txt b/time.txt index 6ff856c0372a5ca574fa97ed1e9046e9074c2ace..26bce90a7a526809dcaa728b998930f06a2d7618 100644 --- a/time.txt +++ b/time.txt @@ -1,2 +1,2 @@ - row and column identified in (sec) : 0.000100 + row and column identified in (sec) : 0.000090