conflict solved

18c0fa29 · cardy20 · 09915adf · 0542d35d · 18c0fa29 · 18c0fa29
Commit 18c0fa29 authored Jun 03, 2023 by cardy20
20 changed files
--- a/tests/tests/testdata/blimp_npi_present_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_npi_present_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_npi_present_1-v0-res.json
+++ b/tests/tests/testdata/blimp_npi_present_1-v0-res.json
--- a/tests/tests/testdata/blimp_npi_present_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_npi_present_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_npi_present_2-v0-res.json
+++ b/tests/tests/testdata/blimp_npi_present_2-v0-res.json
--- a/tests/tests/testdata/blimp_only_npi_licensor_present-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_only_npi_licensor_present-v0-loglikelihood
--- a/tests/tests/testdata/blimp_only_npi_licensor_present-v0-res.json
+++ b/tests/tests/testdata/blimp_only_npi_licensor_present-v0-res.json
--- a/tests/tests/testdata/blimp_only_npi_scope-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_only_npi_scope-v0-loglikelihood
--- a/tests/tests/testdata/blimp_only_npi_scope-v0-res.json
+++ b/tests/tests/testdata/blimp_only_npi_scope-v0-res.json
--- a/tests/tests/testdata/blimp_passive_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_passive_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_passive_1-v0-res.json
+++ b/tests/tests/testdata/blimp_passive_1-v0-res.json
--- a/tests/tests/testdata/blimp_passive_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_passive_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_passive_2-v0-res.json
+++ b/tests/tests/testdata/blimp_passive_2-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_c_command-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_c_command-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_c_command-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_c_command-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_case_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_case_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_case_1-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_case_1-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_case_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_case_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_case_2-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_case_2-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_domain_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_domain_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_domain_1-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_domain_1-v0-res.json