mirror
/
morse-wip
kopia lustrzana https://github.com/ag1le/morse-wip
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Found speed tracking bug. Used break; incorrectly in path.cxx and savep.cxx. 

Fixed in this version.
master
AG1LE Mauri 2014-07-20 10:17:18 -04:00
rodzic 75f4417801
commit f1873ce0fb
4 zmienionych plików z 22 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
Makefile
Wyświetl plik

@ -131,12 +131,12 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = ${SHELL} /home/mauri/Projects/morse/missing --run aclocal-1.11
ACLOCAL = ${SHELL} /home/mauri/Projects/morse-wip/missing --run aclocal-1.11
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
AUTOCONF = ${SHELL} /home/mauri/Projects/morse/missing --run autoconf
AUTOHEADER = ${SHELL} /home/mauri/Projects/morse/missing --run autoheader
AUTOMAKE = ${SHELL} /home/mauri/Projects/morse/missing --run automake-1.11
AUTOCONF = ${SHELL} /home/mauri/Projects/morse-wip/missing --run autoconf
AUTOHEADER = ${SHELL} /home/mauri/Projects/morse-wip/missing --run autoheader
AUTOMAKE = ${SHELL} /home/mauri/Projects/morse-wip/missing --run automake-1.11
AWK = gawk
BMORSE_AUTHORS =
CC = gcc
@ -177,7 +177,7 @@ LIBOBJS =
LIBS = -lm -lsndfile -lfftw3
LTLIBOBJS =
MAINT = #
MAKEINFO = ${SHELL} /home/mauri/Projects/morse/missing --run makeinfo
MAKEINFO = ${SHELL} /home/mauri/Projects/morse-wip/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
OBJEXT = o
PACKAGE = bmorse
@ -198,10 +198,10 @@ SET_MAKE =
SHELL = /bin/bash
STRIP =
VERSION = 0.1.04
abs_builddir = /home/mauri/Projects/morse
abs_srcdir = /home/mauri/Projects/morse
abs_top_builddir = /home/mauri/Projects/morse
abs_top_srcdir = /home/mauri/Projects/morse
abs_builddir = /home/mauri/Projects/morse-wip
abs_srcdir = /home/mauri/Projects/morse-wip
abs_top_builddir = /home/mauri/Projects/morse-wip
abs_top_srcdir = /home/mauri/Projects/morse-wip
ac_ct_CC = gcc
ac_ct_CXX = g++
am__include = include
@ -221,7 +221,7 @@ host_alias =
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /home/mauri/Projects/morse/install-sh
install_sh = ${SHELL} /home/mauri/Projects/morse-wip/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale

13
config.log
Wyświetl plik

@ -400,6 +400,7 @@ on X301
config.status:882: creating Makefile
config.status:882: creating src/Makefile
config.status:882: creating config.h
config.status:1063: config.h is unchanged
config.status:1111: executing depfiles commands
## ---------------- ##
@ -465,7 +466,7 @@ am_cv_make_support_nested_variables=yes
## Output variables. ##
## ----------------- ##
ACLOCAL='${SHELL} /home/mauri/Projects/morse/missing --run aclocal-1.11'
ACLOCAL='${SHELL} /home/mauri/Projects/morse-wip/missing --run aclocal-1.11'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
@ -474,9 +475,9 @@ AM_BACKSLASH='\'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
AM_DEFAULT_VERBOSITY='0'
AM_V='$(V)'
AUTOCONF='${SHELL} /home/mauri/Projects/morse/missing --run autoconf'
AUTOHEADER='${SHELL} /home/mauri/Projects/morse/missing --run autoheader'
AUTOMAKE='${SHELL} /home/mauri/Projects/morse/missing --run automake-1.11'
AUTOCONF='${SHELL} /home/mauri/Projects/morse-wip/missing --run autoconf'
AUTOHEADER='${SHELL} /home/mauri/Projects/morse-wip/missing --run autoheader'
AUTOMAKE='${SHELL} /home/mauri/Projects/morse-wip/missing --run automake-1.11'
AWK='gawk'
BMORSE_AUTHORS=''
CC='gcc'
@ -507,7 +508,7 @@ LTLIBOBJS=''
MAINT='#'
MAINTAINER_MODE_FALSE=''
MAINTAINER_MODE_TRUE='#'
MAKEINFO='${SHELL} /home/mauri/Projects/morse/missing --run makeinfo'
MAKEINFO='${SHELL} /home/mauri/Projects/morse-wip/missing --run makeinfo'
MKDIR_P='/bin/mkdir -p'
OBJEXT='o'
PACKAGE='bmorse'
@ -554,7 +555,7 @@ host_alias=''
htmldir='${docdir}'
includedir='${prefix}/include'
infodir='${datarootdir}/info'
install_sh='${SHELL} /home/mauri/Projects/morse/install-sh'
install_sh='${SHELL} /home/mauri/Projects/morse-wip/install-sh'
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale'

4
src/path.cxx
Wyświetl plik

@ -61,12 +61,12 @@ int morse::path_(long int ip, long int lambda, float dur, long int ilrate, long
if (lambda == 0) {
lamsav[j-1] = 0;
break;
continue;
}
lamsav[j-1] = memfcn[k-1][lambda-1];
if (lamsav[j-1] == 0) {
break;
continue;
}
/* NEW DURATION: OBTAIN KEYSTATE OF SAVED PATH AND NEW STATE: */

4
src/savep.cxx
Wyświetl plik

@ -116,7 +116,7 @@ int morse::savep_(float *p, long int *pathsv, long int *isave, long int
j = (ip - 1) * 30 + n;
for (i = 1; i <= nsav; ++i) {
if (j == sort[i]) {
break; //goto L500;
goto L500;
}
}
if (p[j] > *pmax) {
@ -124,6 +124,8 @@ int morse::savep_(float *p, long int *pathsv, long int *isave, long int
jsav = j;
ipsav = ip;
}
L500:
;
}
}
psum += *pmax;