Updated NEQP multipliers and test files (#429)

* Updated NEQP multipliers and test files, ran tests. * Update .gitignore: ignore temporary files from test runs --------- Co-authored-by: Alan Dove <alan@alandove.com> Co-authored-by: zcsahok <ha5cqz@gmx.com>
Tlf · Apr 10, 2024 · dde2253 · dde2253
1 parent db505e9
commit dde2253
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,10 @@ test/run_*
 test/*.log
 test/.deps
 test-driver
+
+# temporary internal files
+.bmdata.dat
+.paras
+
+# backed-up log file
+20*_*_*.log
diff --git a/rules/neqp/neqp_mults b/rules/neqp/neqp_mults
@@ -4,12 +4,12 @@
 ##########################
 ## New England Counties ##
 ##########################
-CT:FAICT,HARCT,LITCT,MIDCT,NHVCT,NLNCT,TOLCT,WINCT
-MA:BARMA,BERMA,BRIMA,DUKMA,ESSMA,FRAMA,HMDMA,HMPMA,MIDMA,NANMA,NORMA,PLYMA,SUFMA,WORMA
-ME:ANDME,AROME,CUMME,FRAME,HANME,KENME,KNOME,LINME,OXFME,PENME,PISME,SAGME,SOMME,WALME,WASME,YORME
-NH:BELNH,CARNH,CHENH,COONH,GRANH,HILNH,MERNH,ROCNH,STRNH,SULNH
-RI:BRIRI,KENRI,NEWRK,PRORI,WASRI
-VT:ADDVT,BENVT,CALVT,CHIVT,ESSVT,FRAVT,GRAVT,LAMVT,ORAVT,ORLVT,RUTVT,WASVT,WNHVT,WNDVT
+CT:CTCAP,CTGBR,CTLCR,CTNAU,CTNOE,CTNOW,CTSOE,CTSOC,CTWES
+MA:MABAR,MABER,MABRI,MADUK,MAESS,MAFRA,MAHMD,MAHMP,MAMID,MANAN,MANOR,MAPLY,MASUF,MAWOR
+ME:MEAND,MEARO,MECUM,MEFRA,MEHAN,MEKEN,MEKNO,MELIN,MEOXF,MEPEN,MEPIS,MESAG,MESOM,MEWAL,MEWAS,MEYOR
+NH:NHBEL,NHCAR,NHCHE,NHCOO,NHGRA,NHHIL,NHMER,NHROC,NHSTR,NHSUL
+RI:RIBRI,RIKEN,RINEW,RIPRO,RIWAS
+VT:VTADD,VTBEN,VTCAL,VTCHI,VTESS,VTFRA,VTGRA,VTLAM,VTORA,VTORL,VTRUT,VTWAS,VTWNH,VTWND
 ################################
 ## Other states and provinces ##
 ################################

diff --git a/rules/neqp/neqp_mults_outside b/rules/neqp/neqp_mults_outside
@@ -3,70 +3,71 @@
 ##########################
 ## New England Counties ##
 ##########################
-FAICT
-HARCT
-LITCT
-MIDCT
-NHVCT
-NLNCT
-TOLCT
-WINCT
-BARMA
-BERMA
-BRIMA
-DUKMA
-ESSMA
-FRAMA
-HMDMA
-HMPMA
-MIDMA
-NANMA
-NORMA
-PLYMA
-SUFMA
-WORMA
-ANDME
-AROME
-CUMME
-FRAME
-HANME
-KENME
-KNOME
-LINME
-OXFME
-PENME
-PISME
-SAGME
-SOMME
-WALME
-WASME
-YORME
-BELNH
-CARNH
-CHENH
-COONH
-GRANH
-HILNH
-MERNH
-ROCNH
-STRNH
-SULNH
-BRIRI
-KENRI
-NEWRK
-PRORI
-WASRI
-ADDVT
-BENVT
-CALVT
-CHIVT
-ESSVT
-FRAVT
-GRAVT
-LAMVT
-ORAVT
-ORLVT
-RUTVT
-WASVT
-WNHVT
-WNDVT
+CTCAP
+CTGBR
+CTLCR
+CTNAU
+CTNOE
+CTNOW
+CTSOE
+CTSOC
+CTWES
+MABAR
+MABER
+MABRI
+MADUK
+MAESS
+MAFRA
+MAHMD
+MAHMP
+MAMID
+MANAN
+MANOR
+MAPLY
+MASUF
+MAWOR
+MEAND
+MEARO
+MECUM
+MEFRA
+MEHAN
+MEKEN
+MEKNO
+MELIN
+MEOXF
+MEPEN
+MEPIS
+MESAG
+MESOM
+MEWAL
+MEWAS
+MEYOR
+NHBEL
+NHCAR
+NHCHE
+NHCOO
+NHGRA
+NHHIL
+NHMER
+NHROC
+NHSTR
+NHSUL
+RIBRI
+RIKEN
+RINEW
+RIPRO
+RIWAS
+VTADD
+VTBEN
+VTCAL
+VTCHI
+VTESS
+VTFRA
+VTGRA
+VTLAM
+VTORA
+VTORL
+VTRUT
+VTWAS
+VTWNH
+VTWND
diff --git a/test/rules/neqp/neqp.log b/test/rules/neqp/neqp.log
@@ -1,5 +1,8 @@
- 40CW  13-Apr-23 22:02 0001  AA1B           599  599  HARCT         CT       2         
- 40CW  13-Apr-23 22:02 0002  AA1C           599  599  HMDMA         MA       2         
+ 40CW  13-Apr-23 22:02 0001  AA1B           599  599  HARCT                  2         
+ 40CW  13-Apr-23 22:02 0002  AA1C           599  599  HMDMA                  2         
  40CW  13-Apr-23 22:03 0003  AA1D           599  599  MIDMA                  2         
  40CW  13-Apr-23 22:03 0004  AA6A           599  599  CA            CA       2         
  40CW  13-Apr-23 22:03 0005  GM1A           599  599  DX            GM       2         
+ 40CW  09-Apr-24 19:12 0006  CT1AA          599  599  DX            CT       2         
+ 40CW  09-Apr-24 19:13 0007  K1AA           599  599  CTCAP         CT       2         
+ 40CW  09-Apr-24 19:13 0008  K1AB           599  599  MESAG         ME       2         
diff --git a/test/rules/neqp/neqp_mults b/test/rules/neqp/neqp_mults
@@ -4,12 +4,12 @@
 ##########################
 ## New England Counties ##
 ##########################
-CT:FAICT,HARCT,LITCT,MIDCT,NHVCT,NLNCT,TOLCT,WINCT
-MA:BARMA,BERMA,BRIMA,DUKMA,ESSMA,FRAMA,HMDMA,HMPMA,MIDMA,NANMA,NORMA,PLYMA,SUFMA,WORMA
-ME:ANDME,AROME,CUMME,FRAME,HANME,KENME,KNOME,LINME,OXFME,PENME,PISME,SAGME,SOMME,WALME,WASME,YORME
-NH:BELNH,CARNH,CHENH,COONH,GRANH,HILNH,MERNH,ROCNH,STRNH,SULNH
-RI:BRIRI,KENRI,NEWRK,PRORI,WASRI
-VT:ADDVT,BENVT,CALVT,CHIVT,ESSVT,FRAVT,GRAVT,LAMVT,ORAVT,ORLVT,RUTVT,WASVT,WNHVT,WNDVT
+CT:CTCAP,CTGBR,CTLCR,CTNAU,CTNOE,CTNOW,CTSOE,CTSOC,CTWES
+MA:MABAR,MABER,MABRI,MADUK,MAESS,MAFRA,MAHMD,MAHMP,MAMID,MANAN,MANOR,MAPLY,MASUF,MAWOR
+ME:MEAND,MEARO,MECUM,MEFRA,MEHAN,MEKEN,MEKNO,MELIN,MEOXF,MEPEN,MEPIS,MESAG,MESOM,MEWAL,MEWAS,MEYOR
+NH:NHBEL,NHCAR,NHCHE,NHCOO,NHGRA,NHHIL,NHMER,NHROC,NHSTR,NHSUL
+RI:RIBRI,RIKEN,RINEW,RIPRO,RIWAS
+VT:VTADD,VTBEN,VTCAL,VTCHI,VTESS,VTFRA,VTGRA,VTLAM,VTORA,VTORL,VTRUT,VTWAS,VTWNH,VTWND
 ################################
 ## Other states and provinces ##
 ################################

diff --git a/test/rules/neqp/neqp_mults_outside b/test/rules/neqp/neqp_mults_outside
@@ -3,70 +3,71 @@
 ##########################
 ## New England Counties ##
 ##########################
-FAICT
-HARCT
-LITCT
-MIDCT
-NHVCT
-NLNCT
-TOLCT
-WINCT
-BARMA
-BERMA
-BRIMA
-DUKMA
-ESSMA
-FRAMA
-HMDMA
-HMPMA
-MIDMA
-NANMA
-NORMA
-PLYMA
-SUFMA
-WORMA
-ANDME
-AROME
-CUMME
-FRAME
-HANME
-KENME
-KNOME
-LINME
-OXFME
-PENME
-PISME
-SAGME
-SOMME
-WALME
-WASME
-YORME
-BELNH
-CARNH
-CHENH
-COONH
-GRANH
-HILNH
-MERNH
-ROCNH
-STRNH
-SULNH
-BRIRI
-KENRI
-NEWRK
-PRORI
-WASRI
-ADDVT
-BENVT
-CALVT
-CHIVT
-ESSVT
-FRAVT
-GRAVT
-LAMVT
-ORAVT
-ORLVT
-RUTVT
-WASVT
-WNHVT
-WNDVT
+CTCAP
+CTGBR
+CTLCR
+CTNAU
+CTNOE
+CTNOW
+CTSOE
+CTSOC
+CTWES
+MABAR
+MABER
+MABRI
+MADUK
+MAESS
+MAFRA
+MAHMD
+MAHMP
+MAMID
+MANAN
+MANOR
+MAPLY
+MASUF
+MAWOR
+MEAND
+MEARO
+MECUM
+MEFRA
+MEHAN
+MEKEN
+MEKNO
+MELIN
+MEOXF
+MEPEN
+MEPIS
+MESAG
+MESOM
+MEWAL
+MEWAS
+MEYOR
+NHBEL
+NHCAR
+NHCHE
+NHCOO
+NHGRA
+NHHIL
+NHMER
+NHROC
+NHSTR
+NHSUL
+RIBRI
+RIKEN
+RINEW
+RIPRO
+RIWAS
+VTADD
+VTBEN
+VTCAL
+VTCHI
+VTESS
+VTFRA
+VTGRA
+VTLAM
+VTORA
+VTORL
+VTRUT
+VTWAS
+VTWNH
+VTWND