kopia lustrzana https://github.com/ag1le/morse-wip
modified initialization
rodzic
c54ad23a22
commit
49ae04742a
44
config.log
44
config.log
|
@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
|
|||
It was created by bmorse configure 0.1.02, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ ./configure
|
||||
$ ./configure --no-create --no-recursion
|
||||
|
||||
## --------- ##
|
||||
## Platform. ##
|
||||
|
@ -382,27 +382,6 @@ configure:4849: $? = 0
|
|||
configure:4856: result: yes
|
||||
configure:5029: creating ./config.status
|
||||
|
||||
## ---------------------- ##
|
||||
## Running config.status. ##
|
||||
## ---------------------- ##
|
||||
|
||||
This file was extended by bmorse config.status 0.1.02, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES =
|
||||
CONFIG_HEADERS =
|
||||
CONFIG_LINKS =
|
||||
CONFIG_COMMANDS =
|
||||
$ ./config.status
|
||||
|
||||
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
|
||||
|
||||
## ---------------- ##
|
||||
## Cache variables. ##
|
||||
## ---------------- ##
|
||||
|
@ -610,3 +589,24 @@ target_alias=''
|
|||
#define _TANDEM_SOURCE 1
|
||||
|
||||
configure: exit 0
|
||||
|
||||
## ---------------------- ##
|
||||
## Running config.status. ##
|
||||
## ---------------------- ##
|
||||
|
||||
This file was extended by bmorse config.status 0.1.02, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES =
|
||||
CONFIG_HEADERS =
|
||||
CONFIG_LINKS =
|
||||
CONFIG_COMMANDS =
|
||||
$ ./config.status
|
||||
|
||||
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
|
||||
|
|
27
src/bmorse.h
27
src/bmorse.h
|
@ -64,7 +64,7 @@ inline double clamp(double x, double min, double max)
|
|||
|
||||
class morse {
|
||||
protected:
|
||||
int initl_(void);
|
||||
|
||||
int likhd_(real z, real rn, integer ip, integer lambda, real dur, integer ilrate);
|
||||
|
||||
int path_(integer ip, integer lambda, real dur, integer ilrate, integer *lamsav, real *dursav, integer *ilrsav);
|
||||
|
@ -82,7 +82,6 @@ protected:
|
|||
int sprob_(real *, integer *, integer *, real *, integer *, real *, real *);
|
||||
doublereal xtrans_(integer *, real , integer );
|
||||
|
||||
|
||||
integer isx[6];
|
||||
real rtrans[2][5] /* was [5][2] */;
|
||||
integer mempr[6][6] /* was [6][6] */;
|
||||
|
@ -97,7 +96,7 @@ protected:
|
|||
|
||||
// Proces variables - Initialized data
|
||||
|
||||
integer isave = PATHS;
|
||||
integer isave;
|
||||
integer lambda[PATHS];
|
||||
integer ilrate[PATHS];
|
||||
real dur[PATHS];
|
||||
|
@ -112,22 +111,23 @@ protected:
|
|||
// Trelis variables - Initialized data
|
||||
|
||||
integer lmdsav[PATHS][NDELAY]; /* was [200][PATHS] */
|
||||
integer n = 0;
|
||||
integer n;
|
||||
integer ndelay = NDELAY;
|
||||
integer ipnod[PATHS];
|
||||
integer ncall = 0;
|
||||
integer nmax = 0;
|
||||
integer mmax = 0;
|
||||
integer ltrsv[NDELAY];
|
||||
integer kd = 0;
|
||||
integer ndelst = 0;
|
||||
integer pthtrl[PATHS][NDELAY]; /* was [200][PATHS] */
|
||||
integer iend = 0;
|
||||
|
||||
integer ncall;
|
||||
integer nmax;
|
||||
integer mmax;
|
||||
integer kd;
|
||||
integer ndelst;
|
||||
integer iend;
|
||||
|
||||
// Xtrans variables - Initialized data
|
||||
|
||||
integer kimap[6] = { 1, 3, 1, 3, 7, 14 };
|
||||
real aparm[3] = { 3.f, 1.5f, 1.f };
|
||||
integer kimap[6];
|
||||
real aparm[3];
|
||||
|
||||
// Kalman filter parameters
|
||||
real ykkip[PATHS];
|
||||
|
@ -138,9 +138,12 @@ protected:
|
|||
real pin[30][PATHS]; /* was pin[750] */
|
||||
real lkhd[30][PATHS]; // was lkhd[750]
|
||||
|
||||
int initl_(void);
|
||||
public:
|
||||
morse()
|
||||
:
|
||||
kimap { 1, 3, 1, 3, 7, 14 },
|
||||
aparm { 3.f, 1.5f, 1.f },
|
||||
isx { 1, 1, 0, 0, 0, 0 },
|
||||
// rtrans[2][5] - symbol conditional speed transition probabilities - Page 104 - Table X
|
||||
// used in spdtr.cxx
|
||||
|
|
|
@ -32,6 +32,15 @@
|
|||
|
||||
int morse::initl_(void)
|
||||
{
|
||||
isave = PATHS;
|
||||
n = 0;
|
||||
ncall = 0;
|
||||
nmax = 0;
|
||||
mmax = 0;
|
||||
kd = 0;
|
||||
ndelst = 0;
|
||||
iend = 0;
|
||||
|
||||
return 0;
|
||||
} /* initl_ */
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue