From 6f7b68945dc3e8ddd17dff58f95dd68f1eb34dc8 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 21 Apr 2017 18:43:40 +0200 Subject: [PATCH] tests/regression/sens, fix test cases which have been invalidated by commit: ifparm, #4/16, missing IF_REDUNDANT for some aliases, introduce IOPAPR before this commit, sensitivity to "capacitance" was published twice, once with name "c1" (reference name of a CAP device) and as "c1_c" (reference name of a CAP concatenated with param name "c") after said commit, sensitivity is no longer published as "c1_c" (because "c" is only an "alias"/IF_REDUNDANT of the main parameter which is named "capacitance", and "capacitance" is a IF_PRINCIPAL and thus avoids "concatenation" of the parameter name) --- tests/regression/sens/sens-ac-1.cir | 4 ++-- tests/regression/sens/sens-ac-2.cir | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/regression/sens/sens-ac-1.cir b/tests/regression/sens/sens-ac-1.cir index 8afef835f..33f76cd97 100644 --- a/tests/regression/sens/sens-ac-1.cir +++ b/tests/regression/sens/sens-ac-1.cir @@ -12,7 +12,7 @@ set gold = $curplot let s = (0,2) * pi * 1e6 let i1_acmag = 1 / (s*100p + 1/1k) let r1 = 42mA / (1 + s*100p * 1k)^2 -let c1_c = - 42mA * s / (s*100p + 1/1k)^2 +let c1 = - 42mA * s / (s*100p + 1/1k)^2 * run a "sens" analysis sens v(1) ac lin 1 1e6 1.1e6 @@ -30,7 +30,7 @@ define mismatch(a,b,err) abs(a-b)>err*abs(b) let total_count = 0 let fail_count = 0 -foreach n i1_acmag c1_c r1 +foreach n i1_acmag c1 r1 set n_test = "$n" set n_gold = "{$gold}.$n" if mismatch($n_test, $n_gold, 1e-3) diff --git a/tests/regression/sens/sens-ac-2.cir b/tests/regression/sens/sens-ac-2.cir index 651147e93..8224b7305 100644 --- a/tests/regression/sens/sens-ac-2.cir +++ b/tests/regression/sens/sens-ac-2.cir @@ -15,9 +15,9 @@ set gold = $curplot let s = (0,2) * pi * 1e6 let v1_acmag = ( 0.1258214312760609, -0.5915026769337883 ) let r1 = ( -38.77993150952251u, 196.2381768346785u ) -let c2_c = ( -4912987.937722201, -1131146.799006112 ) +let c2 = ( -4912987.937722201, -1131146.799006112 ) let l3 = ( -1670.021661737812, -453.4103177577211 ) -let c4_c = ( -7419488.478291172, -1226939.0306441 ) +let c4 = ( -7419488.478291172, -1226939.0306441 ) let r5 = ( 1.952734115993878E-5, -1.180848266533405E-4 ) * run a "sens" analysis @@ -36,7 +36,7 @@ define mismatch(a,b,err) abs(a-b)>err*abs(b) let total_count = 0 let fail_count = 0 -foreach n v1_acmag r1 c2_c l3 c4_c r5 +foreach n v1_acmag r1 c2 l3 c4 r5 set n_test = "$n" set n_gold = "{$gold}.$n" if mismatch($n_test, $n_gold, 1e-3)