From 63c0c643bb8f60d7cf481b89c3102678c808d2a1 Mon Sep 17 00:00:00 2001 From: Cédric Date: Sun, 13 Oct 2024 16:00:03 +0200 Subject: Delete duplicated files in java implementation --- java/.gitignore | 2 -- java/Abs.java | 26 ----------------- java/App.java | 22 -------------- java/LCEvaluator.java | 59 ------------------------------------- java/LCEvaluatorTest.java | 74 ----------------------------------------------- java/Main.java | 49 ------------------------------- java/Term.java | 5 ---- java/TermTest.java | 38 ------------------------ java/Var.java | 21 -------------- java/log4j2.xml | 17 ----------- java/pom.xml | 65 ----------------------------------------- 11 files changed, 378 deletions(-) delete mode 100644 java/.gitignore delete mode 100644 java/Abs.java delete mode 100644 java/App.java delete mode 100644 java/LCEvaluator.java delete mode 100644 java/LCEvaluatorTest.java delete mode 100644 java/Main.java delete mode 100644 java/Term.java delete mode 100644 java/TermTest.java delete mode 100644 java/Var.java delete mode 100644 java/log4j2.xml delete mode 100644 java/pom.xml diff --git a/java/.gitignore b/java/.gitignore deleted file mode 100644 index af515ad..0000000 --- a/java/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.idea -target/ diff --git a/java/Abs.java b/java/Abs.java deleted file mode 100644 index 9d1c146..0000000 --- a/java/Abs.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.lambdanantes.lcgoji.ast; - -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; - -import static org.lambdanantes.lcgoji.ast.Var.var; - -@AllArgsConstructor(access = AccessLevel.PROTECTED) -@EqualsAndHashCode -public final class Abs implements Term { - - public static final Abs IDENTITY = λ("x", var("x")); - - public String arg; - public Term body; - - public static Abs λ(String arg, Term body) { - return new Abs(arg, body); - } - - @Override - public String toString() { - return "λ" + arg + "." + body; - } -} \ No newline at end of file diff --git a/java/App.java b/java/App.java deleted file mode 100644 index 2f3e04d..0000000 --- a/java/App.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.lambdanantes.lcgoji.ast; - -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; - -@AllArgsConstructor(access = AccessLevel.PROTECTED) -@EqualsAndHashCode -public final class App implements Term { - - public Term left; - public Term right; - - public static App apply(Term left, Term right) { - return new App(left, right); - } - - @Override - public String toString() { - return "(" + left + ") " + right; - } -} \ No newline at end of file diff --git a/java/LCEvaluator.java b/java/LCEvaluator.java deleted file mode 100644 index b0fe69b..0000000 --- a/java/LCEvaluator.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.lambdanantes.lcgoji; - -import org.lambdanantes.lcgoji.ast.Abs; -import org.lambdanantes.lcgoji.ast.App; -import org.lambdanantes.lcgoji.ast.Term; -import org.lambdanantes.lcgoji.ast.Var; - -import static org.lambdanantes.lcgoji.ast.Abs.λ; -import static org.lambdanantes.lcgoji.ast.App.apply; - -public class LCEvaluator { - - public static Term evaluate(Term term) { - switch (term) { - case Var var -> { - return var; - } - case Abs abs -> { - return abs; - } - case App app -> { - switch (app.left) { - case Abs abs -> { - return substitute(abs.body, abs.arg, app.right); - } - case App _app -> { - return app; - } - case Var _var -> { - return app; - } - } - } - } - } - - private static Term substitute(Term body, String arg, Term val) { - switch (body) { - case Var var -> { - if (var.name.equals(arg)) { - return val; - } else { - return body; - } - } - case App app -> { - return apply(substitute(app.left, arg, val), substitute(app.right, arg, val)); - } - case Abs abs -> { - if (abs.arg.equals(arg)) { - // Pas de substitution des variables redéfinies - return abs; - } else { - return λ(abs.arg, substitute(abs.body, arg, val)); - } - } - } - } -} \ No newline at end of file diff --git a/java/LCEvaluatorTest.java b/java/LCEvaluatorTest.java deleted file mode 100644 index ec2f027..0000000 --- a/java/LCEvaluatorTest.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.lambdanantes.lcgoji; - -import org.junit.Test; -import org.lambdanantes.lcgoji.ast.Term; -import org.lambdanantes.lcgoji.ast.Var; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.lambdanantes.lcgoji.LCEvaluator.evaluate; -import static org.lambdanantes.lcgoji.ast.Abs.IDENTITY; -import static org.lambdanantes.lcgoji.ast.Abs.λ; -import static org.lambdanantes.lcgoji.ast.App.apply; -import static org.lambdanantes.lcgoji.ast.Var.var; - -public class LCEvaluatorTest { - - Var x = var("x"); - Var y = var("y"); - Var z = var("z"); - - @Test - public void l_evaluation_d_une_variable_rend_la_meme_variable() { - // evaluate(x) == x - assertEvalTo(x, x); - } - - @Test - public void l_evaluation_d_une_abstraction_rend_la_meme_abstraction() { - // evaluate(λx.x) == λx.x - assertEvalTo(IDENTITY, IDENTITY); - } - - @Test - public void l_evaluation_de_l_application_de_deux_vars_rend_la_meme_application() { - // evaluate(x y) == x y - assertEvalTo(apply(x, y), apply(x, y)); - } - - @Test - public void l_evaluation_de_l_application_de_l_identite_sur_un_argument_rend_l_argument() { - // evaluate((λx.x) y) == y - assertEvalTo(apply(IDENTITY, y), y); - } - - @Test - public void l_evaluation_de_l_application_d_une_abstraction_substitue_son_argument() { - // evaluate((λx.x x) y ) == y y - assertEvalTo(apply(λ("x", apply(x, x)), y), apply(y, y)); - } - - @Test - public void l_evaluation_de_l_application_d_une_abstraction_d_abstraction_substitue_recursivement_son_argument() { - // evaluate((λx.λy.x) z) == λy.z - assertEvalTo(apply(λ("x", λ("y", x)), z), λ("y", z)); - } - - @Test - public void l_evaluation_de_l_application_d_une_abstraction_ne_substitue_pas_ses_variables_libres() { - // evaluate((λx.y) z) == y - assertEvalTo(apply(λ("x", y), z), y); - } - - @Test - public void l_evaluation_de_l_application_d_une_abstraction_d_abstraction_ne_substitue_pas_les_variables_redefinies() { - // evaluate((λx.λx.x) z) == λx.x - assertEvalTo(apply(λ("x", λ("x", x)), z), λ("x", x)); - } - - ///// - - private static void assertEvalTo(Term termToEvaluate, Term result) { - assertThat(evaluate(termToEvaluate), is(result)); - } -} diff --git a/java/Main.java b/java/Main.java deleted file mode 100644 index 76cb839..0000000 --- a/java/Main.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.lambdanantes.lcgoji; - -import lombok.extern.slf4j.Slf4j; -import org.apache.http.client.fluent.Request; -import org.apache.http.client.fluent.Response; -import org.apache.http.entity.StringEntity; - -import static spark.Spark.*; - -@Slf4j -public class Main { - - public static final String TEAM_NAME = "LCGOJI"; - public static final int SELF_PORT = 8888; - public static final String SELF_URL = "http://127.0.0.1:" + SELF_PORT; - public static final String TESTER_URL = "http://127.0.0.1:8080"; - - public static void main(String[] args) throws Exception { - port(SELF_PORT); - - before((request, response) -> log.info("Requête entrante : " + request.requestMethod() + " " + request.pathInfo() + ", query params : " + request.queryString())); - - // API pour l'évaluation de λ-term - // Le body est une S-expression sous sa forme textuelle - post("/eval", (request, response) -> { - String body = request.body(); - log.info("Demande d'évaluation de l'expression : " + body); - - // TODO Parser, contruire l'AST, l'évaluer - String result = body; // Renvoie la s-expression à l'identique pour le moment - - log.info("Réponse envoyée : " + body); - - return result.getBytes(); - }); - - init(); - - // Enregistrement de notre API auprès du tester d'API - String jsonBody = "{\"url\":\"" + SELF_URL + "/eval\", \"name\": \"" + TEAM_NAME + "\"}"; - Response response = Request.Post(TESTER_URL + "/register") - .addHeader("Content-type", "application/json") - .body(new StringEntity(jsonBody)) - .execute(); - - log.info("Résultat de l'enregistrement : "+response.returnContent().toString()); - } - -} \ No newline at end of file diff --git a/java/Term.java b/java/Term.java deleted file mode 100644 index 2dcc9fe..0000000 --- a/java/Term.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.lambdanantes.lcgoji.ast; - -public sealed interface Term permits Var, Abs, App { - -} \ No newline at end of file diff --git a/java/TermTest.java b/java/TermTest.java deleted file mode 100644 index f11ca77..0000000 --- a/java/TermTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.lambdanantes.lcgoji.ast; - -import org.junit.Test; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertThat; -import static org.lambdanantes.lcgoji.ast.Abs.λ; -import static org.lambdanantes.lcgoji.ast.App.apply; -import static org.lambdanantes.lcgoji.ast.Var.var; - -public class TermTest { - - @Test - public void les_equals_des_termes_sont_corrects() { - // x == x - assertThat(var("x"), is(var("x"))); - // x != y - assertThat(var("x"), is(not(var("y")))); - // λx.x == λx.x - assertThat(λ("x", var("x")), is(λ("x", var("x")))); - // λx.x != λy.x - assertThat(λ("x", var("x")), is(not(λ("y", var("x"))))); - // x y == x y - assertThat(apply(var("x"), var("y")), is(apply(var("x"), var("y")))); - // x x != x y - assertThat(apply(var("x"), var("x")), is(not(apply(var("x"), var("y"))))); - } - - @Test - public void les_toString_des_termes_utilisent_la_notation_consacree() { - assertThat(var("x").toString(), is("x")); - assertThat(λ("x", var("x")).toString(), is("λx.x")); - assertThat(apply(λ("x", var("x")), var("x")).toString(), is("(λx.x) x")); - assertThat(apply(λ("x", λ("x", var("x"))), var("y")).toString(), is("(λx.λx.x) y")); - } - -} \ No newline at end of file diff --git a/java/Var.java b/java/Var.java deleted file mode 100644 index ed710b6..0000000 --- a/java/Var.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.lambdanantes.lcgoji.ast; - -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; - -@AllArgsConstructor(access = AccessLevel.PROTECTED) -@EqualsAndHashCode -public final class Var implements Term{ - - public String name; - - public static Var var(String name) { - return new Var(name); - } - - @Override - public String toString() { - return name; - } -} \ No newline at end of file diff --git a/java/log4j2.xml b/java/log4j2.xml deleted file mode 100644 index f938085..0000000 --- a/java/log4j2.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/java/pom.xml b/java/pom.xml deleted file mode 100644 index f4a4f30..0000000 --- a/java/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - org.lambdanantes - lcgoji - 1.0-SNAPSHOT - - - 21 - 21 - UTF-8 - 1.18.30 - 2.16.0 - - 9.4.31.v20200723 - 2.9.3 - 4.3.1 - - 4.10 - - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - - org.eclipse.jetty - jetty-util - ${jetty-util.version} - - - com.sparkjava - spark-core - ${spark-core.version} - - - org.apache.httpcomponents - fluent-hc - ${httpclient.version} - - - - junit - junit - ${junit.version} - - - \ No newline at end of file -- cgit v1.2.3