Revert "Revert "Refs #10199 use same cost function as ISAW""

This reverts commit 22c434b6ef0dc3fcfa7b47db51731aeac8024a54.