diff --git a/demo/demo_annot.bio b/demo/demo_annot.bio deleted file mode 100644 index cf16200fcd0436d943f71127f63894e428fafea7..0000000000000000000000000000000000000000 --- a/demo/demo_annot.bio +++ /dev/null @@ -1,82 +0,0 @@ -Césaire B-PER -Alphonse I-PER -Garon I-PER -marraine O -Adeline B-PER -Dionne I-PER -, O -soussignés O -Lecture O -faite O -Adéline O -Dionne O -Arsène O -Côté O -Arpin O -R O -Le O -onze B-DAT -aout I-DAT -mil I-DAT -neuf I-DAT -cent I-DAT -un I-DAT -nous O -prêtre O -soussigné O -avons O -baptisé O -Marie B-PER -Luce I-PER -Louise I-PER -, O -née O -la B-DAT -veille I-DAT -, O -fille O -légitime O -de O -Carmel B-PER -Côté I-PER -, O -cordonnier B-OCC -, O -pré O -- O -sent O -, O -déclarant O -ne O -savoir O -signer O -, O -et O -de O -Eugé B-PER -nie I-PER -Fréchette I-PER -, O -de O -cette B-LOC -paroisse I-LOC -. O -Parrain O -Napoléon B-PER -Fréchette I-PER -, O -marraine O -Adeline B-PER -Tremblay I-PER -, O -soussignés O -, O -de O -Ste B-LOC -Luce I-LOC -, O -Lec O -- O -ture O -faite O -. O diff --git a/demo/demo_predict.bio b/demo/demo_predict.bio deleted file mode 100644 index 7e01c2d127aa47c95c49ab87a06e06d86f9af9b0..0000000000000000000000000000000000000000 --- a/demo/demo_predict.bio +++ /dev/null @@ -1,81 +0,0 @@ -Césaire B-PER -Alphonse O -Garon B-PER -marraine O -Adeline B-PER -Dionne I-PER -, O -soussignés O -Lecture O -faite O -Adéline O -Dionne O -Arsène O -Côté O -Arpin O -R O -Le O -onze B-DAT -aout I-DAT -mil I-DAT -neuf I-DAT -cent I-DAT -un O -nous O -pretre O -soussigné O -avons O -baptisé O -Marie B-PER -Luce I-PER -Louise I-PER -, O -née O -la B-DAT -veille I-DAT -, O -fille O -légitime O -de O -Carmel B-PER -Côté I-PER -, O -cordonnier B-OCC -, O -pré O -- O -sent O -, O -déclarant O -ne O -savoir O -signer O -, O -et O -de O -Eugé B-PER -nie I-PER -Fréchette I-PER -, O -de O -cette B-LOC -paroisse I-LOC -. O -Parrain O -Napoléon B-PER -Fréchette I-PER -, O -marraine O -Adéline B-PER -Tremblay I-PER -, O -sousignés O -, O -de O -St B-LOC -. I-LOC -Luce O -, O -Lec O -ture O -faite O diff --git a/nerval/evaluate.py b/nerval/evaluate.py index 2f0070d218c9985ac0ba336e5af4bc33143dd245..4eef4f840cf16715d0c24c4f254d6b2bd831b59f 100644 --- a/nerval/evaluate.py +++ b/nerval/evaluate.py @@ -624,36 +624,24 @@ def main(): logging.basicConfig(level=logging.INFO) parser = argparse.ArgumentParser(description="Compute score of NER on predict.") - parser.add_argument( - "-m", - "--multiple", - help="Single if 1, multiple 2", - type=int, - required=True, - ) - parser.add_argument( + + group = parser.add_mutually_exclusive_group() + group.add_argument( "-a", "--annot", help="Annotation in BIO format.", ) - parser.add_argument( - "-p", - "--predict", - help="Prediction in BIO format.", - ) - parser.add_argument( - "-t", - "--threshold", - help="Set a distance threshold for the match between gold and predicted entity.", - default=THRESHOLD, - type=threshold_float_type, - ) - parser.add_argument( + group.add_argument( "-c", "--csv", help="Csv with the correlation between the annotation bio files and the predict bio files", type=Path, ) + parser.add_argument( + "-p", + "--predict", + help="Prediction in BIO format.", + ) parser.add_argument( "-f", "--folder", @@ -666,25 +654,32 @@ def main(): help="Print only the recap if False", action="store_false", ) + parser.add_argument( + "-t", + "--threshold", + help="Set a distance threshold for the match between gold and predicted entity.", + default=THRESHOLD, + type=threshold_float_type, + ) + args = parser.parse_args() - if args.multiple == 1 or args.multiple == 2: - if args.multiple == 2: - if not args.folder: - raise argparse.ArgumentError(args.folder, "-f must be given if -m is 2") - if not args.csv: - raise argparse.ArgumentError(args.folder, "-c must be given if -m is 2") - if args.folder and args.csv: - run_multiple(args.csv, args.folder, args.threshold, args.verbose) - if args.multiple == 1: - if not args.annot: - raise argparse.ArgumentError(args.folder, "-a must be given if -m is 1") - if not args.predict: - raise argparse.ArgumentError(args.folder, "-p must be given if -m is 1") - if args.annot and args.predict: - run(args.annot, args.predict, args.threshold, args.verbose) + if args.annot: + if not args.predict: + raise argparse.ArgumentError( + args.folder, "You need to specify the path to a predict file" + ) + if args.annot and args.predict: + run(args.annot, args.predict, args.threshold, args.verbose) + elif args.csv: + if not args.csv: + raise argparse.ArgumentError( + args.folder, "You need to specify the path to a folder of bio files" + ) + if args.folder and args.csv: + run_multiple(args.csv, args.folder, args.threshold, args.verbose) else: - raise argparse.ArgumentTypeError("Value has to be 1 or 2") + raise Exception("You need to specify the argument of input file") if __name__ == "__main__":