Skip to content

Commit 2b7337e

Browse files
claesenmclaesenm
committedOct 3, 2013
bugfix in binaryworkflow prediction when ensemble size == 1
·
2.0
1 parent 6a9af7d commit 2b7337e

File tree

4 files changed

+73
-70
lines changed

4 files changed

+73
-70
lines changed
 

‎autom4te.cache/output.1

-2
Original file line numberDiff line numberDiff line change
@@ -16599,8 +16599,6 @@ $as_echo "@%:@define HAVE_CXX11 1" >>confdefs.h
1659916599
# THREADING SUPPORT
1660016600
#####
1660116601

16602-
# Extra flags
16603-
1660416602
@%:@ Check whether --enable-threads was given.
1660516603
if test "${enable_threads+set}" = set; then :
1660616604
enableval=$enable_threads;

‎autom4te.cache/traces.1

+65-65
Original file line numberDiff line numberDiff line change
@@ -718,74 +718,74 @@ m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_CXX11], [/* define if the compiler
718718
m4trace:configure.ac:96: -1- AC_SUBST([HAVE_CXX11])
719719
m4trace:configure.ac:96: -1- AC_SUBST_TRACE([HAVE_CXX11])
720720
m4trace:configure.ac:96: -1- m4_pattern_allow([^HAVE_CXX11$])
721-
m4trace:configure.ac:107: -1- AM_CONDITIONAL([ENABLE_THREADS], [test x$USE_THREADS = x1])
722-
m4trace:configure.ac:107: -1- AC_SUBST([ENABLE_THREADS_TRUE])
723-
m4trace:configure.ac:107: -1- AC_SUBST_TRACE([ENABLE_THREADS_TRUE])
724-
m4trace:configure.ac:107: -1- m4_pattern_allow([^ENABLE_THREADS_TRUE$])
725-
m4trace:configure.ac:107: -1- AC_SUBST([ENABLE_THREADS_FALSE])
726-
m4trace:configure.ac:107: -1- AC_SUBST_TRACE([ENABLE_THREADS_FALSE])
727-
m4trace:configure.ac:107: -1- m4_pattern_allow([^ENABLE_THREADS_FALSE$])
728-
m4trace:configure.ac:107: -1- _AM_SUBST_NOTMAKE([ENABLE_THREADS_TRUE])
729-
m4trace:configure.ac:107: -1- _AM_SUBST_NOTMAKE([ENABLE_THREADS_FALSE])
730-
m4trace:configure.ac:108: -1- _AM_COND_IF([ENABLE_THREADS])
731-
m4trace:configure.ac:108: -1- AC_SUBST([ax_pthread_config])
732-
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([ax_pthread_config])
733-
m4trace:configure.ac:108: -1- m4_pattern_allow([^ax_pthread_config$])
734-
m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
735-
m4trace:configure.ac:108: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
736-
m4trace:configure.ac:108: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
721+
m4trace:configure.ac:105: -1- AM_CONDITIONAL([ENABLE_THREADS], [test x$USE_THREADS = x1])
722+
m4trace:configure.ac:105: -1- AC_SUBST([ENABLE_THREADS_TRUE])
723+
m4trace:configure.ac:105: -1- AC_SUBST_TRACE([ENABLE_THREADS_TRUE])
724+
m4trace:configure.ac:105: -1- m4_pattern_allow([^ENABLE_THREADS_TRUE$])
725+
m4trace:configure.ac:105: -1- AC_SUBST([ENABLE_THREADS_FALSE])
726+
m4trace:configure.ac:105: -1- AC_SUBST_TRACE([ENABLE_THREADS_FALSE])
727+
m4trace:configure.ac:105: -1- m4_pattern_allow([^ENABLE_THREADS_FALSE$])
728+
m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([ENABLE_THREADS_TRUE])
729+
m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([ENABLE_THREADS_FALSE])
730+
m4trace:configure.ac:106: -1- _AM_COND_IF([ENABLE_THREADS])
731+
m4trace:configure.ac:106: -1- AC_SUBST([ax_pthread_config])
732+
m4trace:configure.ac:106: -1- AC_SUBST_TRACE([ax_pthread_config])
733+
m4trace:configure.ac:106: -1- m4_pattern_allow([^ax_pthread_config$])
734+
m4trace:configure.ac:106: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
735+
m4trace:configure.ac:106: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
736+
m4trace:configure.ac:106: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
737737
your system. */
738738
@%:@undef PTHREAD_CREATE_JOINABLE])
739-
m4trace:configure.ac:108: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD_PRIO_INHERIT])
740-
m4trace:configure.ac:108: -2- m4_pattern_allow([^HAVE_PTHREAD_PRIO_INHERIT$])
741-
m4trace:configure.ac:108: -2- AH_OUTPUT([HAVE_PTHREAD_PRIO_INHERIT], [/* Have PTHREAD_PRIO_INHERIT. */
739+
m4trace:configure.ac:106: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD_PRIO_INHERIT])
740+
m4trace:configure.ac:106: -2- m4_pattern_allow([^HAVE_PTHREAD_PRIO_INHERIT$])
741+
m4trace:configure.ac:106: -2- AH_OUTPUT([HAVE_PTHREAD_PRIO_INHERIT], [/* Have PTHREAD_PRIO_INHERIT. */
742742
@%:@undef HAVE_PTHREAD_PRIO_INHERIT])
743-
m4trace:configure.ac:108: -1- AC_SUBST([PTHREAD_CC])
744-
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([PTHREAD_CC])
745-
m4trace:configure.ac:108: -1- m4_pattern_allow([^PTHREAD_CC$])
746-
m4trace:configure.ac:108: -1- AC_SUBST([PTHREAD_LIBS])
747-
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
748-
m4trace:configure.ac:108: -1- m4_pattern_allow([^PTHREAD_LIBS$])
749-
m4trace:configure.ac:108: -1- AC_SUBST([PTHREAD_CFLAGS])
750-
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
751-
m4trace:configure.ac:108: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
752-
m4trace:configure.ac:108: -1- AC_SUBST([PTHREAD_CC])
753-
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([PTHREAD_CC])
754-
m4trace:configure.ac:108: -1- m4_pattern_allow([^PTHREAD_CC$])
755-
m4trace:configure.ac:108: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
756-
m4trace:configure.ac:108: -2- m4_pattern_allow([^HAVE_PTHREAD$])
757-
m4trace:configure.ac:108: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
743+
m4trace:configure.ac:106: -1- AC_SUBST([PTHREAD_CC])
744+
m4trace:configure.ac:106: -1- AC_SUBST_TRACE([PTHREAD_CC])
745+
m4trace:configure.ac:106: -1- m4_pattern_allow([^PTHREAD_CC$])
746+
m4trace:configure.ac:106: -1- AC_SUBST([PTHREAD_LIBS])
747+
m4trace:configure.ac:106: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
748+
m4trace:configure.ac:106: -1- m4_pattern_allow([^PTHREAD_LIBS$])
749+
m4trace:configure.ac:106: -1- AC_SUBST([PTHREAD_CFLAGS])
750+
m4trace:configure.ac:106: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
751+
m4trace:configure.ac:106: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
752+
m4trace:configure.ac:106: -1- AC_SUBST([PTHREAD_CC])
753+
m4trace:configure.ac:106: -1- AC_SUBST_TRACE([PTHREAD_CC])
754+
m4trace:configure.ac:106: -1- m4_pattern_allow([^PTHREAD_CC$])
755+
m4trace:configure.ac:106: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
756+
m4trace:configure.ac:106: -2- m4_pattern_allow([^HAVE_PTHREAD$])
757+
m4trace:configure.ac:106: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
758758
@%:@undef HAVE_PTHREAD])
759-
m4trace:configure.ac:108: -1- _AM_COND_ENDIF([ENABLE_THREADS])
760-
m4trace:configure.ac:117: -1- AC_CONFIG_HEADERS([config.h])
761-
m4trace:configure.ac:118: -1- AC_CONFIG_FILES([Makefile])
762-
m4trace:configure.ac:125: -1- AC_SUBST([LTLIBOBJS])
759+
m4trace:configure.ac:106: -1- _AM_COND_ENDIF([ENABLE_THREADS])
760+
m4trace:configure.ac:115: -1- AC_CONFIG_HEADERS([config.h])
761+
m4trace:configure.ac:116: -1- AC_CONFIG_FILES([Makefile])
762+
m4trace:configure.ac:123: -1- AC_SUBST([LTLIBOBJS])
763+
m4trace:configure.ac:123: -1- AC_SUBST_TRACE([LTLIBOBJS])
764+
m4trace:configure.ac:123: -1- m4_pattern_allow([^LTLIBOBJS$])
765+
m4trace:configure.ac:125: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
766+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
767+
m4trace:configure.ac:125: -1- m4_pattern_allow([^LIB@&t@OBJS$])
768+
m4trace:configure.ac:125: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
763769
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([LTLIBOBJS])
764770
m4trace:configure.ac:125: -1- m4_pattern_allow([^LTLIBOBJS$])
765-
m4trace:configure.ac:127: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
766-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
767-
m4trace:configure.ac:127: -1- m4_pattern_allow([^LIB@&t@OBJS$])
768-
m4trace:configure.ac:127: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
769-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([LTLIBOBJS])
770-
m4trace:configure.ac:127: -1- m4_pattern_allow([^LTLIBOBJS$])
771-
m4trace:configure.ac:127: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
772-
m4trace:configure.ac:127: -1- AC_SUBST([am__EXEEXT_TRUE])
773-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
774-
m4trace:configure.ac:127: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
775-
m4trace:configure.ac:127: -1- AC_SUBST([am__EXEEXT_FALSE])
776-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
777-
m4trace:configure.ac:127: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
778-
m4trace:configure.ac:127: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
779-
m4trace:configure.ac:127: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
780-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([top_builddir])
781-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([top_build_prefix])
782-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([srcdir])
783-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([abs_srcdir])
784-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([top_srcdir])
785-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([abs_top_srcdir])
786-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([builddir])
787-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([abs_builddir])
788-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([abs_top_builddir])
789-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([INSTALL])
790-
m4trace:configure.ac:127: -1- AC_SUBST_TRACE([MKDIR_P])
791-
m4trace:configure.ac:127: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
771+
m4trace:configure.ac:125: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
772+
m4trace:configure.ac:125: -1- AC_SUBST([am__EXEEXT_TRUE])
773+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
774+
m4trace:configure.ac:125: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
775+
m4trace:configure.ac:125: -1- AC_SUBST([am__EXEEXT_FALSE])
776+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
777+
m4trace:configure.ac:125: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
778+
m4trace:configure.ac:125: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
779+
m4trace:configure.ac:125: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
780+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([top_builddir])
781+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([top_build_prefix])
782+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([srcdir])
783+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([abs_srcdir])
784+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([top_srcdir])
785+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([abs_top_srcdir])
786+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([builddir])
787+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([abs_builddir])
788+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([abs_top_builddir])
789+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([INSTALL])
790+
m4trace:configure.ac:125: -1- AC_SUBST_TRACE([MKDIR_P])
791+
m4trace:configure.ac:125: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])

‎configure

-2
Original file line numberDiff line numberDiff line change
@@ -16599,8 +16599,6 @@ $as_echo "#define HAVE_CXX11 1" >>confdefs.h
1659916599
# THREADING SUPPORT
1660016600
#####
1660116601

16602-
# Extra flags
16603-
1660416602
# Check whether --enable-threads was given.
1660516603
if test "${enable_threads+set}" = set; then :
1660616604
enableval=$enable_threads;

‎src/BinaryWorkflow.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,14 @@ std::vector<double> BinaryWorkflow::decision_value(const SparseVector &i) const{
161161
Vector result(1,0.0);
162162
result.reserve(intermediate.size()+1);
163163
std::copy(intermediate.begin(),intermediate.end(),std::back_inserter(result));
164-
result[0] = Helper<Postprocessing>::eval(postprocessing,std::move(intermediate));
164+
165+
if(postprocessing.get())
166+
result[0] = Helper<Postprocessing>::eval(postprocessing,std::move(intermediate));
167+
else{
168+
assert(predictor->num_outputs()==1 &&
169+
"No postprocessing included even though aggregation is required.");
170+
result[0] = intermediate[0];
171+
}
165172
return std::move(result);
166173
}
167174
std::vector<double> BinaryWorkflow::decision_value(const std::vector<double> &i) const{

0 commit comments

Comments
 (0)
Please sign in to comment.