Skip to content

Commit 3cfea07

Browse files
andreasnoackandreasnoack
authored
Remove all branches in runtests.jl associated with unsupported versions of Julia (#568)
1 parent 3e4114f commit 3cfea07

File tree

1 file changed

+40
-98
lines changed

1 file changed

+40
-98
lines changed

‎test/runtests.jl‎

Lines changed: 40 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,15 +1325,9 @@ end
13251325
@test ft1.dof ≈ dof(mod) - dof(nullmod)
13261326
@test ft1.fstat ≈ ft1base.fstat[2]
13271327
@test ft1.pval ≈ ft1base.pval[2]
1328-
if VERSION >= v"1.6.0"
1329-
@test sprint(show, ft1) == """
1330-
F-test against the null model:
1331-
F-statistic: 241.62 on 12 observations and 1 degrees of freedom, p-value: <1e-07"""
1332-
else
1333-
@test sprint(show, ft1) == """
1334-
F-test against the null model:
1335-
F-statistic: 241.62 on 12 observations and 1 degrees of freedom, p-value: <1e-7"""
1336-
end
1328+
@test sprint(show, ft1) == """
1329+
F-test against the null model:
1330+
F-statistic: 241.62 on 12 observations and 1 degrees of freedom, p-value: <1e-07"""
13371331

13381332
ft2 = ftest(othermod)
13391333
ft2base = ftest(nullmod, othermod)
@@ -1351,15 +1345,9 @@ end
13511345
@test ft3.dof ≈ dof(bothmod) - dof(nullmod)
13521346
@test ft3.fstat ≈ ft3base.fstat[2]
13531347
@test ft3.pval ≈ ft3base.pval[2]
1354-
if VERSION >= v"1.6.0"
1355-
@test sprint(show, ft3) == """
1356-
F-test against the null model:
1357-
F-statistic: 81.97 on 12 observations and 3 degrees of freedom, p-value: <1e-05"""
1358-
else
1359-
@test sprint(show, ft3) == """
1360-
F-test against the null model:
1361-
F-statistic: 81.97 on 12 observations and 3 degrees of freedom, p-value: <1e-5"""
1362-
end
1348+
@test sprint(show, ft3) == """
1349+
F-test against the null model:
1350+
F-statistic: 81.97 on 12 observations and 3 degrees of freedom, p-value: <1e-05"""
13631351

13641352
@test_throws ArgumentError ftest(nointerceptmod)
13651353
end
@@ -1385,101 +1373,55 @@ end
13851373
ft1a = ftest(mod, nullmod)
13861374
@test isnan(ft1a.pval[1])
13871375
@test ft1a.pval[2] ≈ 2.481215056713184e-8
1388-
if VERSION >= v"1.6.0"
1389-
@test sprint(show, ft1a) == """
1390-
F-test: 2 models fitted on 12 observations
1391-
─────────────────────────────────────────────────────────────────
1392-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1393-
─────────────────────────────────────────────────────────────────
1394-
[1] 3 0.1283 0.9603
1395-
[2] 2 -1 3.2292 3.1008 0.0000 -0.9603 241.6234 <1e-07
1396-
─────────────────────────────────────────────────────────────────"""
1397-
else
1398-
@test sprint(show, ft1a) == """
1399-
F-test: 2 models fitted on 12 observations
1400-
────────────────────────────────────────────────────────────────
1401-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1402-
────────────────────────────────────────────────────────────────
1403-
[1] 3 0.1283 0.9603
1404-
[2] 2 -1 3.2292 3.1008 0.0000 -0.9603 241.6234 <1e-7
1405-
────────────────────────────────────────────────────────────────"""
1406-
end
1376+
@test sprint(show, ft1a) == """
1377+
F-test: 2 models fitted on 12 observations
1378+
─────────────────────────────────────────────────────────────────
1379+
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1380+
─────────────────────────────────────────────────────────────────
1381+
[1] 3 0.1283 0.9603
1382+
[2] 2 -1 3.2292 3.1008 0.0000 -0.9603 241.6234 <1e-07
1383+
─────────────────────────────────────────────────────────────────"""
14071384

14081385
ft1b = ftest(nullmod, mod)
14091386
@test isnan(ft1b.pval[1])
14101387
@test ft1b.pval[2] ≈ 2.481215056713184e-8
1411-
if VERSION >= v"1.6.0"
1412-
@test sprint(show, ft1b) == """
1413-
F-test: 2 models fitted on 12 observations
1414-
─────────────────────────────────────────────────────────────────
1415-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1416-
─────────────────────────────────────────────────────────────────
1417-
[1] 2 3.2292 0.0000
1418-
[2] 3 1 0.1283 -3.1008 0.9603 0.9603 241.6234 <1e-07
1419-
─────────────────────────────────────────────────────────────────"""
1420-
else
1421-
@test sprint(show, ft1b) == """
1422-
F-test: 2 models fitted on 12 observations
1423-
────────────────────────────────────────────────────────────────
1424-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1425-
────────────────────────────────────────────────────────────────
1426-
[1] 2 3.2292 0.0000
1427-
[2] 3 1 0.1283 -3.1008 0.9603 0.9603 241.6234 <1e-7
1428-
────────────────────────────────────────────────────────────────"""
1429-
end
1388+
@test sprint(show, ft1b) == """
1389+
F-test: 2 models fitted on 12 observations
1390+
─────────────────────────────────────────────────────────────────
1391+
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1392+
─────────────────────────────────────────────────────────────────
1393+
[1] 2 3.2292 0.0000
1394+
[2] 3 1 0.1283 -3.1008 0.9603 0.9603 241.6234 <1e-07
1395+
─────────────────────────────────────────────────────────────────"""
14301396

14311397
bigmod = lm(@formula(Result~Treatment+Other), d)
14321398
ft2a = ftest(nullmod, mod, bigmod)
14331399
@test isnan(ft2a.pval[1])
14341400
@test ft2a.pval[2] ≈ 2.481215056713184e-8
14351401
@test ft2a.pval[3] ≈ 0.3949973540194818
1436-
if VERSION >= v"1.6.0"
1437-
@test sprint(show, ft2a) == """
1438-
F-test: 3 models fitted on 12 observations
1439-
─────────────────────────────────────────────────────────────────
1440-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1441-
─────────────────────────────────────────────────────────────────
1442-
[1] 2 3.2292 0.0000
1443-
[2] 3 1 0.1283 -3.1008 0.9603 0.9603 241.6234 <1e-07
1444-
[3] 5 2 0.1017 -0.0266 0.9685 0.0082 1.0456 0.3950
1445-
─────────────────────────────────────────────────────────────────"""
1446-
else
1447-
@test sprint(show, ft2a) == """
1448-
F-test: 3 models fitted on 12 observations
1449-
─────────────────────────────────────────────────────────────────
1450-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1451-
─────────────────────────────────────────────────────────────────
1452-
[1] 2 3.2292 0.0000
1453-
[2] 3 1 0.1283 -3.1008 0.9603 0.9603 241.6234 <1e-7
1454-
[3] 5 2 0.1017 -0.0266 0.9685 0.0082 1.0456 0.3950
1455-
─────────────────────────────────────────────────────────────────"""
1456-
end
1402+
@test sprint(show, ft2a) == """
1403+
F-test: 3 models fitted on 12 observations
1404+
─────────────────────────────────────────────────────────────────
1405+
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1406+
─────────────────────────────────────────────────────────────────
1407+
[1] 2 3.2292 0.0000
1408+
[2] 3 1 0.1283 -3.1008 0.9603 0.9603 241.6234 <1e-07
1409+
[3] 5 2 0.1017 -0.0266 0.9685 0.0082 1.0456 0.3950
1410+
─────────────────────────────────────────────────────────────────"""
14571411

14581412
ft2b = ftest(bigmod, mod, nullmod)
14591413
@test isnan(ft2b.pval[1])
14601414
@test ft2b.pval[2] ≈ 0.3949973540194818
14611415
@test ft2b.pval[3] ≈ 2.481215056713184e-8
1462-
if VERSION >= v"1.6.0"
1463-
@test sprint(show, ft2b) == """
1464-
F-test: 3 models fitted on 12 observations
1465-
─────────────────────────────────────────────────────────────────
1466-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1467-
─────────────────────────────────────────────────────────────────
1468-
[1] 5 0.1017 0.9685
1469-
[2] 3 -2 0.1283 0.0266 0.9603 -0.0082 1.0456 0.3950
1470-
[3] 2 -1 3.2292 3.1008 0.0000 -0.9603 241.6234 <1e-07
1471-
─────────────────────────────────────────────────────────────────"""
1472-
else
1473-
@test sprint(show, ft2b) == """
1474-
F-test: 3 models fitted on 12 observations
1475-
─────────────────────────────────────────────────────────────────
1476-
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1477-
─────────────────────────────────────────────────────────────────
1478-
[1] 5 0.1017 0.9685
1479-
[2] 3 -2 0.1283 0.0266 0.9603 -0.0082 1.0456 0.3950
1480-
[3] 2 -1 3.2292 3.1008 0.0000 -0.9603 241.6234 <1e-7
1481-
─────────────────────────────────────────────────────────────────"""
1482-
end
1416+
@test sprint(show, ft2b) == """
1417+
F-test: 3 models fitted on 12 observations
1418+
─────────────────────────────────────────────────────────────────
1419+
DOF ΔDOF SSR ΔSSR R² ΔR² F* p(>F)
1420+
─────────────────────────────────────────────────────────────────
1421+
[1] 5 0.1017 0.9685
1422+
[2] 3 -2 0.1283 0.0266 0.9603 -0.0082 1.0456 0.3950
1423+
[3] 2 -1 3.2292 3.1008 0.0000 -0.9603 241.6234 <1e-07
1424+
─────────────────────────────────────────────────────────────────"""
14831425

14841426
@test_throws ArgumentError ftest(mod, bigmod, nullmod)
14851427
@test_throws ArgumentError ftest(nullmod, bigmod, mod)

0 commit comments

Comments
 (0)