linear lcE

martin-raden · martin-raden · commit 9530e12264bf · 2019-07-31T17:20:17.000+02:00
diff --git a/src/IntaRNA/ObjectiveHandler.cpp b/src/IntaRNA/ObjectiveHandler.cpp
@@ -31,12 +31,11 @@ getLcE( const size_t & curLength, const E_type & fullE, const InteractionEnergy
 {
 //	const size_t maxLength = std::max( std::min(energy.getAccessibility1().getSequence().size(), energy.getAccessibility1().getMaxLength())
 //							, std::min(energy.getAccessibility2().getSequence().size(), energy.getAccessibility2().getMaxLength()) );
-LOG_IF(curLength<1, DEBUG) <<"curLength < 1";
-	return (E_type)( (double)(fullE) / std::log2(1+(double)curLength) );
+//	return (E_type)( (double)(fullE) / std::log2(1+(double)curLength) );
 //	return (E_type)( (double)(fullE) / std::log(5+(double)curLength) );
 //	return (E_type)( (double)(fullE) / std::log(2.0*(double)curLength) );
 //	return (fullE) / (E_type)curLength;
-//	return (fullE * maxLength) / curLength;
+	return E_type((float)(fullE) / (float)curLength);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,11 @@ getLcE( const size_t & curLength, const E_type & fullE, const InteractionEnergy`
`31`	`31`	`{`
`32`	`32`	`// const size_t maxLength = std::max( std::min(energy.getAccessibility1().getSequence().size(), energy.getAccessibility1().getMaxLength())`
`33`	`33`	`// , std::min(energy.getAccessibility2().getSequence().size(), energy.getAccessibility2().getMaxLength()) );`
`34`		`-LOG_IF(curLength<1, DEBUG) <<"curLength < 1";`
`35`		`- return (E_type)( (double)(fullE) / std::log2(1+(double)curLength) );`
	`34`	`+// return (E_type)( (double)(fullE) / std::log2(1+(double)curLength) );`
`36`	`35`	`// return (E_type)( (double)(fullE) / std::log(5+(double)curLength) );`
`37`	`36`	`// return (E_type)( (double)(fullE) / std::log(2.0*(double)curLength) );`
`38`	`37`	`// return (fullE) / (E_type)curLength;`
`39`		`-// return (fullE * maxLength) / curLength;`
	`38`	`+ return E_type((float)(fullE) / (float)curLength);`
`40`	`39`	`}`
`41`	`40`
`42`	`41`