From 8361a7bb55313efbdd6922b21f4d1a3d5739e708 Mon Sep 17 00:00:00 2001 From: Attilio Mattiocco Date: Thu, 18 Apr 2024 10:48:25 +0200 Subject: [PATCH] add operators family layer --- v2.1/docs/conf.py | 49 ++++++++++--------- .../Addition/content.rst | 0 .../Addition/examples/ds_1.csv | 0 .../Addition/examples/ds_1.json | 0 .../Addition/examples/ds_2.csv | 0 .../Addition/examples/ds_2.json | 0 .../Addition/examples/ex_1.csv | 0 .../Addition/examples/ex_1.json | 0 .../Addition/examples/ex_1.vtl | 0 .../Addition/examples/ex_2.csv | 0 .../Addition/examples/ex_2.json | 0 .../Addition/examples/ex_2.vtl | 0 .../Addition/examples/ex_3.csv | 0 .../Addition/examples/ex_3.json | 0 .../Addition/examples/ex_3.vtl | 0 .../Addition/examples/intro.rst | 0 .../Division/content.rst | 0 .../Division/examples/ds_1.csv | 0 .../Division/examples/ds_1.json | 0 .../Division/examples/ds_2.csv | 0 .../Division/examples/ds_2.json | 0 .../Division/examples/ds_3.csv | 0 .../Division/examples/ds_3.json | 0 .../Division/examples/ex_1.csv | 0 .../Division/examples/ex_1.json | 0 .../Division/examples/ex_1.vtl | 0 .../Division/examples/ex_2.csv | 0 .../Division/examples/ex_2.json | 0 .../Division/examples/ex_2.vtl | 0 .../Division/examples/ex_3.csv | 0 .../Division/examples/ex_3.json | 0 .../Division/examples/ex_3.vtl | 0 .../Division/examples/intro.rst | 0 .../Multiplication/content.rst | 0 .../Multiplication/examples/ds_1.csv | 0 .../Multiplication/examples/ds_1.json | 0 .../Multiplication/examples/ds_2.csv | 0 .../Multiplication/examples/ds_2.json | 0 .../Multiplication/examples/ex_1.csv | 0 .../Multiplication/examples/ex_1.json | 0 .../Multiplication/examples/ex_1.vtl | 0 .../Multiplication/examples/ex_2.csv | 0 .../Multiplication/examples/ex_2.json | 0 .../Multiplication/examples/ex_2.vtl | 0 .../Multiplication/examples/ex_3.csv | 0 .../Multiplication/examples/ex_3.json | 0 .../Multiplication/examples/ex_3.vtl | 0 .../Multiplication/examples/intro.rst | 0 .../Subtraction/content.rst | 0 .../Subtraction/examples/ds_1.csv | 0 .../Subtraction/examples/ds_1.json | 0 .../Subtraction/examples/ds_2.csv | 0 .../Subtraction/examples/ds_2.json | 0 .../Subtraction/examples/ex_1.csv | 0 .../Subtraction/examples/ex_1.json | 0 .../Subtraction/examples/ex_1.vtl | 0 .../Subtraction/examples/ex_2.csv | 0 .../Subtraction/examples/ex_2.json | 0 .../Subtraction/examples/ex_2.vtl | 0 .../Subtraction/examples/ex_3.csv | 0 .../Subtraction/examples/ex_3.json | 0 .../Subtraction/examples/ex_3.vtl | 0 .../Subtraction/examples/intro.rst | 0 .../Unary Minus/content.rst | 5 +- .../Unary Minus/examples/ds_1.csv | 0 .../Unary Minus/examples/ds_1.json | 0 .../Unary Minus/examples/ex_1.csv | 0 .../Unary Minus/examples/ex_1.json | 0 .../Unary Minus/examples/ex_1.vtl | 0 .../Unary Minus/examples/ex_2.csv | 0 .../Unary Minus/examples/ex_2.json | 0 .../Unary Minus/examples/ex_2.vtl | 0 .../Unary Minus/examples/intro.rst | 0 .../Unary Plus/content.rst | 7 ++- .../Unary Plus/examples/ds_1.csv | 0 .../Unary Plus/examples/ds_1.json | 0 .../Unary Plus/examples/ex_1.csv | 0 .../Unary Plus/examples/ex_1.json | 0 .../Unary Plus/examples/ex_1.vtl | 0 .../Unary Plus/examples/ex_2.csv | 0 .../Unary Plus/examples/ex_2.json | 0 .../Unary Plus/examples/ex_2.vtl | 0 .../Unary Plus/examples/intro.rst | 0 .../operators/Numeric Operators/index.rst | 8 +++ .../docs/operators/String Operators/index.rst | 8 +++ v2.1/docs/operators/index.rst | 7 +-- 86 files changed, 49 insertions(+), 35 deletions(-) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/content.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ds_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ds_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ds_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ds_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_1.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_2.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_3.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_3.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/ex_3.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Addition/examples/intro.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/content.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ds_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ds_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ds_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ds_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ds_3.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ds_3.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_1.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_2.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_3.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_3.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/ex_3.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Division/examples/intro.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/content.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ds_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ds_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ds_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ds_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_1.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_2.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_3.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_3.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/ex_3.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Multiplication/examples/intro.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/content.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ds_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ds_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ds_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ds_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_1.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_2.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_3.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_3.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/ex_3.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Subtraction/examples/intro.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/content.rst (86%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ds_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ds_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ex_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ex_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ex_1.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ex_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ex_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/ex_2.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Minus/examples/intro.rst (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/content.rst (82%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ds_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ds_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ex_1.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ex_1.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ex_1.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ex_2.csv (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ex_2.json (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/ex_2.vtl (100%) rename v2.1/docs/operators/{ => Numeric Operators}/Unary Plus/examples/intro.rst (100%) create mode 100644 v2.1/docs/operators/Numeric Operators/index.rst create mode 100644 v2.1/docs/operators/String Operators/index.rst diff --git a/v2.1/docs/conf.py b/v2.1/docs/conf.py index d6d01b7..929d4a5 100644 --- a/v2.1/docs/conf.py +++ b/v2.1/docs/conf.py @@ -36,29 +36,32 @@ def name_norm(value): for template in next(os.walk("templates"))[2]: templates[template] = jinjaEnv.get_template(template) -# Apply templates in each op folder -for op_folder in next(os.walk("operators"))[1]: - # Write the op main page - op_path = Path("operators").joinpath(op_folder) - with open(op_path.joinpath("index.rst"), "w") as f: - f.write(templates["operator"].render({"title": op_folder})) +# Apply templates in each op type folder +for op_type in next(os.walk("operators"))[1]: + op_type_path = Path("operators").joinpath(op_type) + # Apply templates in each op folder + for op_folder in next(os.walk(op_type_path))[1]: + # Write the op main page + op_path = op_type_path.joinpath(op_folder) + with open(op_path.joinpath("index.rst"), "w") as f: + f.write(templates["operator"].render({"title": op_folder})) - # Write the op examples - examples_folder = op_path.joinpath("examples") - - ds_list = sorted(x.with_suffix('').name for x in examples_folder.glob("ds_*.csv")) - inputs = [] - for i in range(len(ds_list)): - inputs.append({ "folder": examples_folder, "i": i + 1, "name": ds_list[i] }) - - ex_list = sorted(x.with_suffix('').name for x in examples_folder.glob("ex_*.vtl")) - examples = [] - for i in range(len(ex_list)): - examples.append({ "folder": examples_folder, "i": i + 1, "name": ex_list[i] }) - - with open(op_path.joinpath("examples.rst"), "w") as f: - f.write( - templates["examples"].render({"examples": examples, "inputs": inputs, "repourl_ex": "https://github.com/sdmx-twg/vtl/blob/master/v2.1/docs"}) - ) + # Write the op examples + examples_folder = op_path.joinpath("examples") + + ds_list = sorted(x.with_suffix('').name for x in examples_folder.glob("ds_*.csv")) + inputs = [] + for i in range(len(ds_list)): + inputs.append({ "folder": examples_folder, "i": i + 1, "name": ds_list[i] }) + + ex_list = sorted(x.with_suffix('').name for x in examples_folder.glob("ex_*.vtl")) + examples = [] + for i in range(len(ex_list)): + examples.append({ "folder": examples_folder, "i": i + 1, "name": ex_list[i] }) + + with open(op_path.joinpath("examples.rst"), "w") as f: + f.write( + templates["examples"].render({"examples": examples, "inputs": inputs, "repourl_ex": "https://github.com/sdmx-twg/vtl/blob/master/v2.1/docs"}) + ) plantuml = "java -jar " + os.getenv("PUML_PATH", "/tmp/plantuml-mit-1.2023.13.jar") diff --git a/v2.1/docs/operators/Addition/content.rst b/v2.1/docs/operators/Numeric Operators/Addition/content.rst similarity index 100% rename from v2.1/docs/operators/Addition/content.rst rename to v2.1/docs/operators/Numeric Operators/Addition/content.rst diff --git a/v2.1/docs/operators/Addition/examples/ds_1.csv b/v2.1/docs/operators/Numeric Operators/Addition/examples/ds_1.csv similarity index 100% rename from v2.1/docs/operators/Addition/examples/ds_1.csv rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ds_1.csv diff --git a/v2.1/docs/operators/Addition/examples/ds_1.json b/v2.1/docs/operators/Numeric Operators/Addition/examples/ds_1.json similarity index 100% rename from v2.1/docs/operators/Addition/examples/ds_1.json rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ds_1.json diff --git a/v2.1/docs/operators/Addition/examples/ds_2.csv b/v2.1/docs/operators/Numeric Operators/Addition/examples/ds_2.csv similarity index 100% rename from v2.1/docs/operators/Addition/examples/ds_2.csv rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ds_2.csv diff --git a/v2.1/docs/operators/Addition/examples/ds_2.json b/v2.1/docs/operators/Numeric Operators/Addition/examples/ds_2.json similarity index 100% rename from v2.1/docs/operators/Addition/examples/ds_2.json rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ds_2.json diff --git a/v2.1/docs/operators/Addition/examples/ex_1.csv b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_1.csv similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_1.csv rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_1.csv diff --git a/v2.1/docs/operators/Addition/examples/ex_1.json b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_1.json similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_1.json rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_1.json diff --git a/v2.1/docs/operators/Addition/examples/ex_1.vtl b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_1.vtl similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_1.vtl rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_1.vtl diff --git a/v2.1/docs/operators/Addition/examples/ex_2.csv b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_2.csv similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_2.csv rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_2.csv diff --git a/v2.1/docs/operators/Addition/examples/ex_2.json b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_2.json similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_2.json rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_2.json diff --git a/v2.1/docs/operators/Addition/examples/ex_2.vtl b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_2.vtl similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_2.vtl rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_2.vtl diff --git a/v2.1/docs/operators/Addition/examples/ex_3.csv b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_3.csv similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_3.csv rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_3.csv diff --git a/v2.1/docs/operators/Addition/examples/ex_3.json b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_3.json similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_3.json rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_3.json diff --git a/v2.1/docs/operators/Addition/examples/ex_3.vtl b/v2.1/docs/operators/Numeric Operators/Addition/examples/ex_3.vtl similarity index 100% rename from v2.1/docs/operators/Addition/examples/ex_3.vtl rename to v2.1/docs/operators/Numeric Operators/Addition/examples/ex_3.vtl diff --git a/v2.1/docs/operators/Addition/examples/intro.rst b/v2.1/docs/operators/Numeric Operators/Addition/examples/intro.rst similarity index 100% rename from v2.1/docs/operators/Addition/examples/intro.rst rename to v2.1/docs/operators/Numeric Operators/Addition/examples/intro.rst diff --git a/v2.1/docs/operators/Division/content.rst b/v2.1/docs/operators/Numeric Operators/Division/content.rst similarity index 100% rename from v2.1/docs/operators/Division/content.rst rename to v2.1/docs/operators/Numeric Operators/Division/content.rst diff --git a/v2.1/docs/operators/Division/examples/ds_1.csv b/v2.1/docs/operators/Numeric Operators/Division/examples/ds_1.csv similarity index 100% rename from v2.1/docs/operators/Division/examples/ds_1.csv rename to v2.1/docs/operators/Numeric Operators/Division/examples/ds_1.csv diff --git a/v2.1/docs/operators/Division/examples/ds_1.json b/v2.1/docs/operators/Numeric Operators/Division/examples/ds_1.json similarity index 100% rename from v2.1/docs/operators/Division/examples/ds_1.json rename to v2.1/docs/operators/Numeric Operators/Division/examples/ds_1.json diff --git a/v2.1/docs/operators/Division/examples/ds_2.csv b/v2.1/docs/operators/Numeric Operators/Division/examples/ds_2.csv similarity index 100% rename from v2.1/docs/operators/Division/examples/ds_2.csv rename to v2.1/docs/operators/Numeric Operators/Division/examples/ds_2.csv diff --git a/v2.1/docs/operators/Division/examples/ds_2.json b/v2.1/docs/operators/Numeric Operators/Division/examples/ds_2.json similarity index 100% rename from v2.1/docs/operators/Division/examples/ds_2.json rename to v2.1/docs/operators/Numeric Operators/Division/examples/ds_2.json diff --git a/v2.1/docs/operators/Division/examples/ds_3.csv b/v2.1/docs/operators/Numeric Operators/Division/examples/ds_3.csv similarity index 100% rename from v2.1/docs/operators/Division/examples/ds_3.csv rename to v2.1/docs/operators/Numeric Operators/Division/examples/ds_3.csv diff --git a/v2.1/docs/operators/Division/examples/ds_3.json b/v2.1/docs/operators/Numeric Operators/Division/examples/ds_3.json similarity index 100% rename from v2.1/docs/operators/Division/examples/ds_3.json rename to v2.1/docs/operators/Numeric Operators/Division/examples/ds_3.json diff --git a/v2.1/docs/operators/Division/examples/ex_1.csv b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_1.csv similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_1.csv rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_1.csv diff --git a/v2.1/docs/operators/Division/examples/ex_1.json b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_1.json similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_1.json rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_1.json diff --git a/v2.1/docs/operators/Division/examples/ex_1.vtl b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_1.vtl similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_1.vtl rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_1.vtl diff --git a/v2.1/docs/operators/Division/examples/ex_2.csv b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_2.csv similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_2.csv rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_2.csv diff --git a/v2.1/docs/operators/Division/examples/ex_2.json b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_2.json similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_2.json rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_2.json diff --git a/v2.1/docs/operators/Division/examples/ex_2.vtl b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_2.vtl similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_2.vtl rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_2.vtl diff --git a/v2.1/docs/operators/Division/examples/ex_3.csv b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_3.csv similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_3.csv rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_3.csv diff --git a/v2.1/docs/operators/Division/examples/ex_3.json b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_3.json similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_3.json rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_3.json diff --git a/v2.1/docs/operators/Division/examples/ex_3.vtl b/v2.1/docs/operators/Numeric Operators/Division/examples/ex_3.vtl similarity index 100% rename from v2.1/docs/operators/Division/examples/ex_3.vtl rename to v2.1/docs/operators/Numeric Operators/Division/examples/ex_3.vtl diff --git a/v2.1/docs/operators/Division/examples/intro.rst b/v2.1/docs/operators/Numeric Operators/Division/examples/intro.rst similarity index 100% rename from v2.1/docs/operators/Division/examples/intro.rst rename to v2.1/docs/operators/Numeric Operators/Division/examples/intro.rst diff --git a/v2.1/docs/operators/Multiplication/content.rst b/v2.1/docs/operators/Numeric Operators/Multiplication/content.rst similarity index 100% rename from v2.1/docs/operators/Multiplication/content.rst rename to v2.1/docs/operators/Numeric Operators/Multiplication/content.rst diff --git a/v2.1/docs/operators/Multiplication/examples/ds_1.csv b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_1.csv similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ds_1.csv rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_1.csv diff --git a/v2.1/docs/operators/Multiplication/examples/ds_1.json b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_1.json similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ds_1.json rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_1.json diff --git a/v2.1/docs/operators/Multiplication/examples/ds_2.csv b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_2.csv similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ds_2.csv rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_2.csv diff --git a/v2.1/docs/operators/Multiplication/examples/ds_2.json b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_2.json similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ds_2.json rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ds_2.json diff --git a/v2.1/docs/operators/Multiplication/examples/ex_1.csv b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_1.csv similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_1.csv rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_1.csv diff --git a/v2.1/docs/operators/Multiplication/examples/ex_1.json b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_1.json similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_1.json rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_1.json diff --git a/v2.1/docs/operators/Multiplication/examples/ex_1.vtl b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_1.vtl similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_1.vtl rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_1.vtl diff --git a/v2.1/docs/operators/Multiplication/examples/ex_2.csv b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_2.csv similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_2.csv rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_2.csv diff --git a/v2.1/docs/operators/Multiplication/examples/ex_2.json b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_2.json similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_2.json rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_2.json diff --git a/v2.1/docs/operators/Multiplication/examples/ex_2.vtl b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_2.vtl similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_2.vtl rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_2.vtl diff --git a/v2.1/docs/operators/Multiplication/examples/ex_3.csv b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_3.csv similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_3.csv rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_3.csv diff --git a/v2.1/docs/operators/Multiplication/examples/ex_3.json b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_3.json similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_3.json rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_3.json diff --git a/v2.1/docs/operators/Multiplication/examples/ex_3.vtl b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_3.vtl similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/ex_3.vtl rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/ex_3.vtl diff --git a/v2.1/docs/operators/Multiplication/examples/intro.rst b/v2.1/docs/operators/Numeric Operators/Multiplication/examples/intro.rst similarity index 100% rename from v2.1/docs/operators/Multiplication/examples/intro.rst rename to v2.1/docs/operators/Numeric Operators/Multiplication/examples/intro.rst diff --git a/v2.1/docs/operators/Subtraction/content.rst b/v2.1/docs/operators/Numeric Operators/Subtraction/content.rst similarity index 100% rename from v2.1/docs/operators/Subtraction/content.rst rename to v2.1/docs/operators/Numeric Operators/Subtraction/content.rst diff --git a/v2.1/docs/operators/Subtraction/examples/ds_1.csv b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_1.csv similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ds_1.csv rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_1.csv diff --git a/v2.1/docs/operators/Subtraction/examples/ds_1.json b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_1.json similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ds_1.json rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_1.json diff --git a/v2.1/docs/operators/Subtraction/examples/ds_2.csv b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_2.csv similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ds_2.csv rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_2.csv diff --git a/v2.1/docs/operators/Subtraction/examples/ds_2.json b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_2.json similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ds_2.json rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ds_2.json diff --git a/v2.1/docs/operators/Subtraction/examples/ex_1.csv b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_1.csv similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_1.csv rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_1.csv diff --git a/v2.1/docs/operators/Subtraction/examples/ex_1.json b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_1.json similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_1.json rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_1.json diff --git a/v2.1/docs/operators/Subtraction/examples/ex_1.vtl b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_1.vtl similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_1.vtl rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_1.vtl diff --git a/v2.1/docs/operators/Subtraction/examples/ex_2.csv b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_2.csv similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_2.csv rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_2.csv diff --git a/v2.1/docs/operators/Subtraction/examples/ex_2.json b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_2.json similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_2.json rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_2.json diff --git a/v2.1/docs/operators/Subtraction/examples/ex_2.vtl b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_2.vtl similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_2.vtl rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_2.vtl diff --git a/v2.1/docs/operators/Subtraction/examples/ex_3.csv b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_3.csv similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_3.csv rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_3.csv diff --git a/v2.1/docs/operators/Subtraction/examples/ex_3.json b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_3.json similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_3.json rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_3.json diff --git a/v2.1/docs/operators/Subtraction/examples/ex_3.vtl b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_3.vtl similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/ex_3.vtl rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/ex_3.vtl diff --git a/v2.1/docs/operators/Subtraction/examples/intro.rst b/v2.1/docs/operators/Numeric Operators/Subtraction/examples/intro.rst similarity index 100% rename from v2.1/docs/operators/Subtraction/examples/intro.rst rename to v2.1/docs/operators/Numeric Operators/Subtraction/examples/intro.rst diff --git a/v2.1/docs/operators/Unary Minus/content.rst b/v2.1/docs/operators/Numeric Operators/Unary Minus/content.rst similarity index 86% rename from v2.1/docs/operators/Unary Minus/content.rst rename to v2.1/docs/operators/Numeric Operators/Unary Minus/content.rst index 2899bf7..4400598 100644 --- a/v2.1/docs/operators/Unary Minus/content.rst +++ b/v2.1/docs/operators/Numeric Operators/Unary Minus/content.rst @@ -51,6 +51,5 @@ Behavior The operator has the behaviour of the "Operators applicable on one Scalar Value or Data Set or Data Set Component" (see the section "Typical behaviours of the ML Operators"). According to the general rules about data types, the operator can be applied also on sub-types of number, that is -the type integer. -If the type of the operand is integer then the result has type integer. If the type of the operand is number then - the result has type number. +the type integer. If the type of the operand is integer then the result has type integer. If the type of the operand +is number then the result has type number. diff --git a/v2.1/docs/operators/Unary Minus/examples/ds_1.csv b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ds_1.csv similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ds_1.csv rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ds_1.csv diff --git a/v2.1/docs/operators/Unary Minus/examples/ds_1.json b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ds_1.json similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ds_1.json rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ds_1.json diff --git a/v2.1/docs/operators/Unary Minus/examples/ex_1.csv b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_1.csv similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ex_1.csv rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_1.csv diff --git a/v2.1/docs/operators/Unary Minus/examples/ex_1.json b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_1.json similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ex_1.json rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_1.json diff --git a/v2.1/docs/operators/Unary Minus/examples/ex_1.vtl b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_1.vtl similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ex_1.vtl rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_1.vtl diff --git a/v2.1/docs/operators/Unary Minus/examples/ex_2.csv b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_2.csv similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ex_2.csv rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_2.csv diff --git a/v2.1/docs/operators/Unary Minus/examples/ex_2.json b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_2.json similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ex_2.json rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_2.json diff --git a/v2.1/docs/operators/Unary Minus/examples/ex_2.vtl b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_2.vtl similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/ex_2.vtl rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/ex_2.vtl diff --git a/v2.1/docs/operators/Unary Minus/examples/intro.rst b/v2.1/docs/operators/Numeric Operators/Unary Minus/examples/intro.rst similarity index 100% rename from v2.1/docs/operators/Unary Minus/examples/intro.rst rename to v2.1/docs/operators/Numeric Operators/Unary Minus/examples/intro.rst diff --git a/v2.1/docs/operators/Unary Plus/content.rst b/v2.1/docs/operators/Numeric Operators/Unary Plus/content.rst similarity index 82% rename from v2.1/docs/operators/Unary Plus/content.rst rename to v2.1/docs/operators/Numeric Operators/Unary Plus/content.rst index bd242d9..c6ec61f 100644 --- a/v2.1/docs/operators/Unary Plus/content.rst +++ b/v2.1/docs/operators/Numeric Operators/Unary Plus/content.rst @@ -50,7 +50,6 @@ Behavior The operator has the behaviour of the "Operators applicable on one Scalar Value or Data Set or Data Set Component" (see the section "Typical behaviours of the ML Operators"). -According to the general rules about data types, the operator can be applied also on sub-types of number, that is -the type integer. -If the type of the operand is integer then the result has type integer. If the type of the operand is number then - the result has type number. +According to the general rules about data types, the operator can be applied also on sub-types of number, +that is the type integer. If the type of the operand is integer then the result has type integer. If the +type of the operand is number then the result has type number. diff --git a/v2.1/docs/operators/Unary Plus/examples/ds_1.csv b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ds_1.csv similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ds_1.csv rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ds_1.csv diff --git a/v2.1/docs/operators/Unary Plus/examples/ds_1.json b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ds_1.json similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ds_1.json rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ds_1.json diff --git a/v2.1/docs/operators/Unary Plus/examples/ex_1.csv b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_1.csv similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ex_1.csv rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_1.csv diff --git a/v2.1/docs/operators/Unary Plus/examples/ex_1.json b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_1.json similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ex_1.json rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_1.json diff --git a/v2.1/docs/operators/Unary Plus/examples/ex_1.vtl b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_1.vtl similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ex_1.vtl rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_1.vtl diff --git a/v2.1/docs/operators/Unary Plus/examples/ex_2.csv b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_2.csv similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ex_2.csv rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_2.csv diff --git a/v2.1/docs/operators/Unary Plus/examples/ex_2.json b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_2.json similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ex_2.json rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_2.json diff --git a/v2.1/docs/operators/Unary Plus/examples/ex_2.vtl b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_2.vtl similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/ex_2.vtl rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/ex_2.vtl diff --git a/v2.1/docs/operators/Unary Plus/examples/intro.rst b/v2.1/docs/operators/Numeric Operators/Unary Plus/examples/intro.rst similarity index 100% rename from v2.1/docs/operators/Unary Plus/examples/intro.rst rename to v2.1/docs/operators/Numeric Operators/Unary Plus/examples/intro.rst diff --git a/v2.1/docs/operators/Numeric Operators/index.rst b/v2.1/docs/operators/Numeric Operators/index.rst new file mode 100644 index 0000000..92c46ca --- /dev/null +++ b/v2.1/docs/operators/Numeric Operators/index.rst @@ -0,0 +1,8 @@ +###################################### +VTL-ML - Numeric Operators +###################################### +.. toctree:: + :glob: + :maxdepth: 1 + + */index diff --git a/v2.1/docs/operators/String Operators/index.rst b/v2.1/docs/operators/String Operators/index.rst new file mode 100644 index 0000000..50e3276 --- /dev/null +++ b/v2.1/docs/operators/String Operators/index.rst @@ -0,0 +1,8 @@ +###################################### +VTL-ML - String Operators +###################################### +.. toctree:: + :glob: + :maxdepth: 1 + + */index diff --git a/v2.1/docs/operators/index.rst b/v2.1/docs/operators/index.rst index 1ae04be..a1d0b43 100644 --- a/v2.1/docs/operators/index.rst +++ b/v2.1/docs/operators/index.rst @@ -1,9 +1,6 @@ -################### +###################################### Reference Manual -################### - -VTL-ML - Numeric operators (row 2907) ----------------------------------------- +###################################### .. toctree:: :glob: :maxdepth: 1