diff -Nur jneural-1.04-orig/Makefile jneural-1.04/Makefile --- jneural-1.04-orig/Makefile Sun Mar 18 04:44:12 2001 +++ jneural-1.04/Makefile Thu Jan 1 08:00:00 1970 @@ -1,112 +0,0 @@ -# Generated automatically from Makefile.in by configure. -CC=gcc -make=make ${MFLAGS} -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" -webdir=/home/jettero/www/jneural -OFLAGS= #-DUSE_STRICT_OVERFLOW_CHECKING -ARCH_DFLAGS= #DFLAGS=-DDEBUG - -MAJOR=1 -VERSION=1.04 - -PREFIX=/usr/local - -all: libjneural.so libjneural.a - @cd apps; ${make} - -clean: - @cd arch; ${make} clean - @cd nets; ${make} clean - @cd apps; ${make} clean - @cd docs; ${make} clean - @cd utils; ${make} clean - @rm -vf objs.txt lib*.{a,so} content.html - -distclean: clean - @rm -vf config.{status,cache,log} `find -name Makefile` - -objs.txt: - @cd arch; ${make} all ${ARCH_DFLAGS} - @cd nets; ${make} all - @cd utils; ${make} all - @echo arch/*.o nets/*.o utils/*.o > objs.txt - -libjneural.so: objs.txt - @${make} OBJS="arch/*.o nets/*.o utils/*.o" libjneural.so_real - -libjneural.a: objs.txt - @${make} OBJS="arch/*.o nets/*.o utils/*.o" libjneural.a_real - -libjneural.a_real: ${OBJS} - @echo Making the Static Library - @ar src libjneural.a ${OBJS} - @chmod 600 libjneural.a - -libjneural.so_real: ${OBJS} - @echo Making the Dynamic Library - @gcc --shared -fPIC -o libjneural.so -Wl,-soname,libjneural.so.${VERSION} ${OBJS} - @chmod 755 libjneural.so - -install: libjneural.so libjneural.a - @cd apps; ${make} install - @echo Attempting Library Install - @touch /etc/passwd 2>/dev/null || echo Be root you fool. - @touch /etc/passwd 2>/dev/null || exit 1 - @install --verbose -d -o0 -g0 -m0755 ${PREFIX}/lib - @install --verbose -d -o0 -g0 -m0755 ${PREFIX}/include - @install --verbose -o0 -g0 -m0755 libjneural.so ${PREFIX}/lib/libjneural.so.${VERSION} - @install --verbose -o0 -g0 -m0644 libjneural.a ${PREFIX}/lib/libjneural.a.${VERSION} - @cd ${PREFIX}/lib; ln -svf libjneural.so.${VERSION} libjneural.so.${MAJOR} - @cd ${PREFIX}/lib; ln -svf libjneural.a.${VERSION} libjneural.a.${MAJOR} - @cd ${PREFIX}/lib; ln -svf libjneural.so.${MAJOR} libjneural.so - @cd ${PREFIX}/lib; ln -svf libjneural.a.${MAJOR} libjneural.a - @install --verbose -d -o0 -g0 -m0755 ${PREFIX}/include - @for i in arch nets utils; do \ - install --verbose -d -o0 -g0 -m0755 ${PREFIX}/include/$$i; \ - cp -v include/$$i/*.h ${PREFIX}/include/$$i; \ - chown 0:0 ${PREFIX}/include/$$i/*.h; \ - done | column -t; \ - -############################################################################ -# -# Simple packaging rules. [This got pretty ugly, try not to read it... ok?] -# -tar=jneural-${VERSION}.tar -tgz=jneural-${VERSION}.tar.gz - -dist: pack -pack: distclean - @echo Creating jneuron.tar.gz - @rm -rvf ../jneural*.tar.gz ${webdir}/jneural*.tar.gz - @(cd ..; tar -cf ${tar} jneural && gzip ${tar}) - @if [ -d ${webdir} ]; then \ - echo Copying txt docs; \ - cp PROGRESSLOG ${webdir}; \ - echo Moving ${tgz} to web dir; \ - mv ../${tgz} ${webdir}; \ - ./update_tmpl ${tgz}; \ - mv content.html ${webdir}; \ - find ${webdir} -type f -exec chmod 644 {} \;;\ - find ${webdir} -type d -exec chmod 755 {} \;;\ - find ${webdir} -name \*.pl -exec chmod 755 {} \;;\ - fi - -doc_pack: clean - @echo Creating ${tgz} - @rm -rvf ../jneural*.tar.gz ${webdir}/jneural*.tar.gz - @(cd ..; tar -cf ${tar} jneural && gzip ${tar}) - @if [ -d ${webdir} ]; then \ - echo Creating postscript and web documents.; \ - (cd docs; ${make}; cp *.ps ${webdir}; ${make} web; \ - ${make} clean);\ - echo Copying txt docs; \ - (cd ${webdir}/; rm -vf *.gz; gzip *.ps);\ - cp PROGRESSLOG ${webdir}; \ - echo Moving ${tgz} to web dir; \ - mv ../${tgz} ${webdir}; \ - ./update_tmpl ${tgz}; \ - mv content.html ${webdir}; \ - find ${webdir} -type f -exec chmod 644 {} \;;\ - find ${webdir} -type d -exec chmod 755 {} \;;\ - find ${webdir} -name \*.pl -exec chmod 755 {} \;;\ - fi diff -Nur jneural-1.04-orig/apps/Makefile jneural-1.04/apps/Makefile --- jneural-1.04-orig/apps/Makefile Sun Mar 18 04:44:12 2001 +++ jneural-1.04/apps/Makefile Thu Jan 1 08:00:00 1970 @@ -1,87 +0,0 @@ -# Generated automatically from Makefile.in by configure. -SHELL=bash -CC=gcc -make=make ${MFLAGS} -CFLAGS=-I${IDIR} ${DFLAGS} ${OFLAGS} -OFLAGS= -O3 #-DUSE_STRICT_OVERFLOW_CHECKING - -#DFLAGS= -DORIENTATION_DEBUG # only used in kohonen type nets. -#DFLAGS= -DCONNECTION_DEBUG -#DFLAGS= -DWEIGHT_DEBUG -#DFLAGS= -DERROR_DEBUG -#DFLAGS= -DIO_DEBUG -#DFLAGS= -DIO_RECALC_DEBUG -#DFLAGS= -DIO_RECALC_DEBUG -DWEIGHT_DEBUG -#DFLAGS= -DIO_DEBUG -DIO_RECALC_DEBUG -DPHASE_DEBUG -#DFLAGS= -DDEBUG - -#DFLAGS= -DIO_DEBUG -DIO_RECALC_DEBUG - -LFLAGS=-L../ -lm -ljneural -lfl -lcurses -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" - -IDIR=../include - -PREFIX=/usr/local - -names=xor sin letters four walker grid_w - -all: ${names} - @echo Removing local object/library files. - -install: all - @echo Installing two examples. The others work better from the apps dir. - @touch /etc/passwd 2>/dev/null || echo Be root you fool. - @touch /etc/passwd 2>/dev/null || exit 1 - @install --verbose -o0 -g0 -m0755 grid_w ${PREFIX}/bin/jn_grid_w - @install --verbose -o0 -g0 -m0755 sin ${PREFIX}/bin/jn_sin - -curr = xor -curr_cmd = ./${curr} 2>trace.log - -test: clean ${curr} - @${curr_cmd} - -sall: spotless ${curr} - @${curr_cmd} - -profile: clean - @echo Profiling ${curr}: - @${make} ${curr} CFLAGS="${CFLAGS} -pg" - @echo Executing ${curr} to generate profile. - @./${curr} - @gprof --no-graph ${curr} | less -S - -pack: - @(cd ..; ${make} pack) - -clean: - @(cd displays; ${make} clean) - @echo Removing all targets in `pwd`. - @rm -rf `cat Makefile | grep ':' | grep -v grep | cut -d: -f1` - @rm -rf *.[ao] file.* file file[0-9] *.log *.cvs *.out - -xor: xor.o ../libjneural.so -sin: sin.o ../libjneural.so -testme: testme.o ../libjneural.so -four: four.o ../libjneural.so -letters: letters.o ../libjneural.so - -walker: walker.o d_walker.a ../libjneural.so -grid_w: grid_w.o d_grid_w.a ../libjneural.so - -d_walker.a d_grid_w.a: - @(cd displays; ${make} $@) - -../libjneural.so: - @cd ../; make libjneural.so - -.SUFFIXES: .o .cpp - -.cpp.o: - @echo Making $@ - @${CC} ${CFLAGS} -c $< - -.o: - @echo Making $@ - @${CC} ${CFLAGS} -o $@ $< `ls d_$*.a 2>/dev/null` ${LFLAGS} diff -Nur jneural-1.04-orig/apps/displays/Makefile jneural-1.04/apps/displays/Makefile --- jneural-1.04-orig/apps/displays/Makefile Sun Mar 18 04:44:12 2001 +++ jneural-1.04/apps/displays/Makefile Thu Jan 1 08:00:00 1970 @@ -1,36 +0,0 @@ -# Generated automatically from Makefile.in by configure. -SHELL=bash -CC=gcc -make=make ${MFLAGS} - -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" - -clean: - @echo Removing all targets in `pwd`. - @rm -rf `cat Makefile | grep ':' | grep -v grep | cut -d: -f1` - @rm -rf *.o file.* file file[0-9] *.log *.cvs - -test: test.cpp d_grid_w.a - @-[ ! -f d_grid_w.a ] && mv ../d_grid_w.a . - @gcc -o test test.cpp d_grid_w.a -lcurses - @./test - -d_walker_o = d_walker.o bwin.o nwin.o -d_grid_w_o = d_grid_w.o bwin.o nwin.o - -d_walker.a: ${d_walker_o} - @${make} $* OBJS="${d_walker_o}" - -d_grid_w.a: ${d_grid_w_o} - @${make} $* OBJS="${d_grid_w_o}" - -.SUFFIXES: .o .cpp - -.cpp.o: - @echo Making $@ - @${CC} ${CFLAGS} -c $< - -.o: - @echo Making $@.a - @ar src $@.a ${OBJS} - @mv $@.a .. diff -Nur jneural-1.04-orig/apps/sin.cpp jneural-1.04/apps/sin.cpp --- jneural-1.04-orig/apps/sin.cpp Sat Dec 25 03:42:54 1999 +++ jneural-1.04/apps/sin.cpp Tue Jun 19 21:23:43 2001 @@ -1,3 +1,4 @@ +#include #include #include diff -Nur jneural-1.04-orig/apps/xor.cpp jneural-1.04/apps/xor.cpp --- jneural-1.04-orig/apps/xor.cpp Sat Dec 25 03:42:50 1999 +++ jneural-1.04/apps/xor.cpp Tue Jun 19 21:19:30 2001 @@ -2,7 +2,7 @@ ** xor(x,y) backprop test program */ #include - +#include #include #include #include diff -Nur jneural-1.04-orig/arch/Makefile jneural-1.04/arch/Makefile --- jneural-1.04-orig/arch/Makefile Sun Mar 18 04:44:12 2001 +++ jneural-1.04/arch/Makefile Thu Jan 1 08:00:00 1970 @@ -1,41 +0,0 @@ -# Generated automatically from Makefile.in by configure. -CC=gcc -make=make ${MFLAGS} -CFLAGS=-I${IDIR} ${OFLAGS} ${DFLAGS} #-Wall #-Duse_instantaneous_propagation -LFLAGS=-lm -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" -LIBDIR=../ - -IDIR=../include -Iarch=${IDIR}/arch - -OBJS= synaptic_group.o layer.o neuron.o hidden_layers.o - -all: archjneural - -archjneural: ${OBJS} - -pack: - @(cd ..; ${make} pack) - -clean: - @echo Removing all targets in `pwd`. - @rm -rf `cat Makefile | grep ':' | grep -v grep | cut -d: -f1` - -layer.o: neuron.o ${Iarch}/layer.h -hidden_layers.o: layer.o ${Iarch}/hidden_layers.h -neuron.o: synaptic_group.o ${Iarch}/neuron.h -synaptic_group.o: ${Iarch}/synaptic_group.h - -spotless: - @cd ${LIBDIR}; ${make} clean - -.SUFFIXES: .o .cpp - -.cpp.o: - @echo Making $@ - @${CC} ${CFLAGS} -c $< - -.o: - @echo Making $@ - @${CC} ${CFLAGS} ${LFLAGS} -o $@ $< ${OBJS} diff -Nur jneural-1.04-orig/arch/neuron.cpp jneural-1.04/arch/neuron.cpp --- jneural-1.04-orig/arch/neuron.cpp Mon Oct 30 22:36:08 2000 +++ jneural-1.04/arch/neuron.cpp Tue Jun 19 21:17:14 2001 @@ -1,3 +1,4 @@ +#include #include #include diff -Nur jneural-1.04-orig/config.cache jneural-1.04/config.cache --- jneural-1.04-orig/config.cache Sun Mar 18 04:44:12 2001 +++ jneural-1.04/config.cache Thu Jan 1 08:00:00 1970 @@ -1,32 +0,0 @@ -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -ac_cv_c_const=${ac_cv_c_const=yes} -ac_cv_func_strstr=${ac_cv_func_strstr=yes} -ac_cv_header_stdc=${ac_cv_header_stdc=yes} -ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes} -ac_cv_lib_curses_main=${ac_cv_lib_curses_main=yes} -ac_cv_lib_fl_main=${ac_cv_lib_fl_main=yes} -ac_cv_lib_fl_yywrap=${ac_cv_lib_fl_yywrap=yes} -ac_cv_lib_m_main=${ac_cv_lib_m_main=yes} -ac_cv_path_install=${ac_cv_path_install='/usr/bin/ginstall -c'} -ac_cv_prog_CC=${ac_cv_prog_CC=gcc} -ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'} -ac_cv_prog_LEX=${ac_cv_prog_LEX=flex} -ac_cv_prog_YACC=${ac_cv_prog_YACC='bison -y'} -ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no} -ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes} -ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes} -ac_cv_prog_gcc=${ac_cv_prog_gcc=yes} -ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes} diff -Nur jneural-1.04-orig/config.log jneural-1.04/config.log --- jneural-1.04-orig/config.log Sun Mar 18 04:44:12 2001 +++ jneural-1.04/config.log Thu Jan 1 08:00:00 1970 @@ -1,33 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -configure:529: checking for gcc -configure:642: checking whether the C compiler (gcc ) works -configure:658: gcc -o conftest conftest.c 1>&5 -configure:684: checking whether the C compiler (gcc ) is a cross-compiler -configure:689: checking whether we are using GNU C -configure:698: gcc -E conftest.c -configure:717: checking whether gcc accepts -g -configure:749: checking how to run the C preprocessor -configure:770: gcc -E conftest.c >/dev/null 2>conftest.out -configure:831: checking for flex -configure:865: checking for yywrap in -lfl -configure:884: gcc -o conftest -g -O2 conftest.c -lfl 1>&5 -configure:937: checking for a BSD compatible install -configure:990: checking whether make sets ${MAKE} -configure:1021: checking for bison -configure:1053: checking for main in -lcurses -configure:1068: gcc -o conftest -g -O2 conftest.c -lcurses 1>&5 -configure:1096: checking for main in -lfl -configure:1111: gcc -o conftest -g -O2 conftest.c -lfl -lcurses 1>&5 -configure:1139: checking for main in -lm -configure:1154: gcc -o conftest -g -O2 conftest.c -lm -lfl -lcurses 1>&5 -configure:1183: checking for ANSI C header files -configure:1196: gcc -E conftest.c >/dev/null 2>conftest.out -configure:1263: gcc -o conftest -g -O2 conftest.c -lm -lfl -lcurses 1>&5 -configure:1290: checking for unistd.h -configure:1300: gcc -E conftest.c >/dev/null 2>conftest.out -configure:1328: checking for working const -configure:1382: gcc -c -g -O2 conftest.c 1>&5 -configure:1406: checking for strstr -configure:1434: gcc -o conftest -g -O2 conftest.c -lm -lfl -lcurses 1>&5 diff -Nur jneural-1.04-orig/config.status jneural-1.04/config.status --- jneural-1.04-orig/config.status Sun Mar 18 04:44:12 2001 +++ jneural-1.04/config.status Thu Jan 1 08:00:00 1970 @@ -1,164 +0,0 @@ -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host corky.voltar-confed.org: -# -# ./configure -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]" -for ac_option -do - case "$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" - exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "./config.status generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "$ac_cs_usage"; exit 0 ;; - *) echo "$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=. -ac_given_INSTALL="/usr/bin/ginstall -c" - -trap 'rm -fr Makefile apps/displays/Makefile apps/Makefile utils/Makefile nets/Makefile arch/Makefile docs/Makefile conftest*; exit 1' 1 2 15 - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g; - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF -/^[ ]*VPATH[ ]*=[^:]*$/d - -s%@SHELL@%/bin/sh%g -s%@CFLAGS@%-g -O2%g -s%@CPPFLAGS@%%g -s%@CXXFLAGS@%%g -s%@FFLAGS@%%g -s%@DEFS@% -DHAVE_LIBCURSES=1 -DHAVE_LIBFL=1 -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRSTR=1 %g -s%@LDFLAGS@%%g -s%@LIBS@%-lm -lfl -lcurses %g -s%@exec_prefix@%${prefix}%g -s%@prefix@%/usr/local%g -s%@program_transform_name@%s,x,x,%g -s%@bindir@%${exec_prefix}/bin%g -s%@sbindir@%${exec_prefix}/sbin%g -s%@libexecdir@%${exec_prefix}/libexec%g -s%@datadir@%${prefix}/share%g -s%@sysconfdir@%${prefix}/etc%g -s%@sharedstatedir@%${prefix}/com%g -s%@localstatedir@%${prefix}/var%g -s%@libdir@%${exec_prefix}/lib%g -s%@includedir@%${prefix}/include%g -s%@oldincludedir@%/usr/include%g -s%@infodir@%${prefix}/info%g -s%@mandir@%${prefix}/man%g -s%@CC@%gcc%g -s%@CPP@%gcc -E%g -s%@LEX@%flex%g -s%@LEXLIB@%-lfl%g -s%@INSTALL_PROGRAM@%${INSTALL}%g -s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g -s%@INSTALL_DATA@%${INSTALL} -m 644%g -s%@SET_MAKE@%%g -s%@YACC@%bison -y%g - -CEOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi - -CONFIG_FILES=${CONFIG_FILES-"Makefile apps/displays/Makefile apps/Makefile utils/Makefile nets/Makefile arch/Makefile docs/Makefile"} -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - - - -exit 0 diff -Nur jneural-1.04-orig/configure jneural-1.04/configure --- jneural-1.04-orig/configure Sun Mar 18 04:41:36 2001 +++ jneural-1.04/configure Tue Jun 19 21:27:32 2001 @@ -1177,14 +1177,57 @@ echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 +echo "configure:1182: checking for main in -lcurses" >&5 +ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1183: checking for ANSI C header files" >&5 +echo "configure:1226: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1192,7 +1235,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1209,7 +1252,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1227,7 +1270,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1248,7 +1291,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1259,7 +1302,7 @@ exit (0); } EOF -if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1286,17 +1329,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1290: checking for $ac_hdr" >&5 +echo "configure:1333: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1324,12 +1367,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1328: checking for working const" >&5 +echo "configure:1371: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1402,12 +1445,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1406: checking for $ac_func" >&5 +echo "configure:1449: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff -Nur jneural-1.04-orig/configure.in jneural-1.04/configure.in --- jneural-1.04-orig/configure.in Mon Oct 30 01:51:11 2000 +++ jneural-1.04/configure.in Tue Jun 19 21:27:20 2001 @@ -17,6 +17,8 @@ AC_CHECK_LIB(fl, main) dnl Replace `main' with a function in -lm: AC_CHECK_LIB(m, main) +dnl Replace `main' with a function in -lcurses +AC_CHECK_LIB(curses, main) dnl Checks for header files. AC_HEADER_STDC diff -Nur jneural-1.04-orig/docs/Makefile jneural-1.04/docs/Makefile --- jneural-1.04-orig/docs/Makefile Sun Mar 18 04:44:13 2001 +++ jneural-1.04/docs/Makefile Thu Jan 1 08:00:00 1970 @@ -1,57 +0,0 @@ -# Generated automatically from Makefile.in by configure. -name=jneural_doc -printer= #-Psuper_laser -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" -make=make ${MFLAGS} - -all: ${name}.ps - -view: ${name}.dvi - @echo Viewing - @xdvi ${name}.dvi -geometry +0+0 - -gview: clean ${name}.ps - @echo Ghostview Viewing - @gv ${name}.ps -geometry +0+0 - -print: ${name}.ps - @echo Feeding off to printer - @lpr ${printer} ${name}.ps - -${name}.dvi: ${name}.tex -${name}.ps: ${name}.dvi - -web: - @echo Doing the LaTeX2HTML thing - @./jnweb 2>/dev/null > /dev/null - -pack: - @(cd ..; ${make} doc_pack) - -clean: - @echo Cleaning out `pwd` - @rm -rf *.aux *.log *.ps *.dvi *.bak *.toc jneural_doc *.bbl *.blg - -.SUFFIXES: .tex .dvi .ps - -.tex.dvi: - @latex $< < /dev/null > /dev/null || cat *.log - @echo Compiled the document. - @if [ -n "`cat $*.log | grep 'No file.*toc'`" ]; then \ - echo -n Remake needed:' ';\ - rm -f $@; \ - ${make} $@ 2>/dev/null; \ - fi - @if [ -n "`cat $*.log | grep Rerun`" ]; then \ - echo -n Remake needed:' ';\ - rm -f $@; \ - ${make} $@ 2>/dev/null; \ - fi - -.dvi.ps: - @echo BibTeXing - @bibtex $* 2>/dev/null > /dev/null; \ - latex $* 2>/dev/null > /dev/null; \ - latex $* 2>/dev/null > /dev/null; - @echo Generating postscript from device independent. - @dvips -f $< > $@ 2>/dev/null diff -Nur jneural-1.04-orig/nets/Makefile jneural-1.04/nets/Makefile --- jneural-1.04-orig/nets/Makefile Sun Mar 18 04:44:12 2001 +++ jneural-1.04/nets/Makefile Thu Jan 1 08:00:00 1970 @@ -1,46 +0,0 @@ -# Generated automatically from Makefile.in by configure. -CC=gcc -make=make ${MFLAGS} -CFLAGS=-I${IDIR} ${DFLAGS} ${OFLAGS} #-Wall - -#DFLAGS= -DERROR_DEBUG -#DFLAGS= -DWEIGHT_DEBUG -#DFLAGS= -DIO_DEBUG -#DFLAGS= -DERROR_DEBUG -DWEIGHT_DEBUG -#DFLAGS= -DDEBUG - -LFLAGS=-lm -L${LIBDIR} -ljneural -ARCHDIR=../arch -LIBDIR=../ -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" - -IDIR=../include -Inets=${IDIR}/nets - -OBJ=sarsa.o backprop.o kohonen.o - -all: ${OBJ} - -pack: - @(cd ..; ${make} pack) - -clean: - @echo Removing all targets in `pwd`. - @rm -rf `cat Makefile | grep ':' | grep -v grep | cut -d: -f1` - -spotless: - @cd ${LIBDIR}; ${make} clean - -sarsa.o: ${Inets}/sarsa.h -backprop.o: ${Inets}/backprop.h -kohonen.o: ${Inets}/kohonen.h - -.SUFFIXES: .o .cpp - -.cpp.o: - @echo Making $@ - @${CC} ${CFLAGS} -c $< - -.o: - @echo Making $@ - @cmd='${CC} ${CFLAGS} -o $@ *.o ${LFLAGS}'; $$cmd || echo failed for $$cmd diff -Nur jneural-1.04-orig/utils/Makefile jneural-1.04/utils/Makefile --- jneural-1.04-orig/utils/Makefile Sun Mar 18 04:44:12 2001 +++ jneural-1.04/utils/Makefile Thu Jan 1 08:00:00 1970 @@ -1,71 +0,0 @@ -# Generated automatically from Makefile.in by configure. -CC=g++ -LEX=flex -YACC=yacc -make=make ${MFLAGS} -CFLAGS=-I${IDIR} ${DFLAGS} ${OFLAGS} #-Wall -LFLAGS=-lm -lfl -MFLAGS=--no-print-directory DFLAGS="${DFLAGS}" OFLAGS="${OFLAGS}" -LIBDIR=../ - -OFLAGS= -DUSE_STRICT_OVERFLOW_CHECKING - -IDIR=../include -Iutils=${IDIR}/utils -Iarch=${IDIR}/arch - - -all: matrix_reader.o transfer.o real.o normalizer.o - -OBJS=lex.yy.o io.o matrix_reader.o matrix.o real.o -test: test.o - @echo Making test - @${CC} ${CFLAGS} -o test test.o ${OBJS} ${LFLAGS} - -test.o: real.o ${OBJS} - -clean: - @echo Removing all targets in `pwd`. - @rm -rf `cat Makefile | grep ':' | grep -v grep | cut -d: -f1` - @rm -f y.tab.h yacc.* - -spotless: - @cd ${LIBDIR}; ${make} clean - -pack: - @(cd ../; make pack) - -real.o: ${Iutils}/real.h -matrix.o: ${Iutils}/matrix.h -transfer.o: ${Iutils}/transfer.h -normalizer.o: ${Iutils}/normalizer.h -matrix_reader.o: lex.yy.o io.o matrix_reader.cpp - -matrix_reader.cpp: y.tab.c matrix.o - @mv y.tab.c matrix_reader.cpp - -sedcommand1=-e s/yylex/matrixlex/g -e s/yyerror/matrixerror/g -sedcommands=${sedcommand1} -e s/yylval/matrixlval/g - -lex.yy.o: lex.yy.c -lex.yy.c: matrix.l y.tab.c - @echo Lexing $< - @${LEX} $< - @cat $@ | sed ${sedcommands} > tmp - @mv tmp $@ - -y.tab.c: matrix.y - @echo Yaccing $< - @${YACC} -p'matrix' -d $< - -io.o: io.h io.c - -.SUFFIXES: .o .cpp .c - -.cpp.o: - @echo Making $@ - @${CC} ${CFLAGS} -c $< - -.c.o: - @echo Making $@ - @${CC} ${CFLAGS} -c $< diff -Nur jneural-1.04-orig/utils/transfer.cpp jneural-1.04/utils/transfer.cpp --- jneural-1.04-orig/utils/transfer.cpp Sun Dec 26 05:37:20 1999 +++ jneural-1.04/utils/transfer.cpp Tue Jun 19 21:18:16 2001 @@ -1,3 +1,4 @@ +#include #include #include