Merge branch 'strongbranching_dynamiclookahead_lognormal' of git.zib.de:integer/scip into strongbranching_dynamiclookahead_lognormal

GioniMexi · GioniMexi · commit 65f918467a42 · 2025-04-26T01:47:53.000+02:00
diff --git a/src/scip/branch_relpscost.c b/src/scip/branch_relpscost.c
@@ -882,7 +882,7 @@ SCIP_Real strongBranchingTreeSize(
    return pow(2.0, estimatedepth + 1.0) - 1.0;
 }
 
-/* Calculate the cumulative distribution function (CDF) value for an exponential distribution. */
+/* Calculate the cumulative distribution function (CDF) value for a mixture of a Dirac at zero and a continuous distribution (depending on distributioncdf) */
 static
 SCIP_Real cdfProbability(
    SCIP_Real             rate,               /** rate of the distribution */

Original file line number	Diff line number	Diff line change
`@@ -882,7 +882,7 @@ SCIP_Real strongBranchingTreeSize(`
`882`	`882`	`return pow(2.0, estimatedepth + 1.0) - 1.0;`
`883`	`883`	`}`
`884`	`884`
`885`		`-/* Calculate the cumulative distribution function (CDF) value for an exponential distribution. */`
	`885`	`+/* Calculate the cumulative distribution function (CDF) value for a mixture of a Dirac at zero and a continuous distribution (depending on distributioncdf) */`
`886`	`886`	`static`
`887`	`887`	`SCIP_Real cdfProbability(`
`888`	`888`	`SCIP_Real rate, /** rate of the distribution */`