From ff1e7fc10d6ca67fff174ab778aaafd5d36174ca Mon Sep 17 00:00:00 2001
From: Frederik Beimgraben <frederik@beimgraben.net>
Date: Sat, 11 Jan 2025 16:37:30 +0100
Subject: [PATCH] fix: Change file names; Fix interpolateLine

---
 .gitignore               |   4 +++-
 MMS24_25.c => MMS24-25.c |   6 ++----
 MMS24_25.h => MMS24-25.h |   0
 Makefile                 |   8 ++++++++
 testInterpolation        | Bin 0 -> 16040 bytes
 testInterpolation.c      |  31 +++++++++++++++++++++++++++++++
 6 files changed, 44 insertions(+), 5 deletions(-)
 rename MMS24_25.c => MMS24-25.c (96%)
 rename MMS24_25.h => MMS24-25.h (100%)
 create mode 100644 Makefile
 create mode 100755 testInterpolation
 create mode 100644 testInterpolation.c

diff --git a/.gitignore b/.gitignore
index 6065ccf..254bdcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,6 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-main
\ No newline at end of file
+main
+
+result.txt
\ No newline at end of file
diff --git a/MMS24_25.c b/MMS24-25.c
similarity index 96%
rename from MMS24_25.c
rename to MMS24-25.c
index 4c339b4..e210532 100644
--- a/MMS24_25.c
+++ b/MMS24-25.c
@@ -11,7 +11,7 @@
  * https://git.beimgraben.net/MMS-2024-25/MMS-Loesung-2024-25.git
  */
 
-#include "MMS24_25.h"
+#include "MMS24-25.h"
 #include "math.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,10 +31,8 @@ double interpolateLine(
         double dXq
     ) {
     double y = (
-        (dY2 - dY1) / (dY2 - dX1)
-    ) * dXq - (
         (dY2 - dY1) / (dX2 - dX1)
-    ) * dX1 + dY1;
+    ) * (dXq + dX1);
 
     #ifdef _DEBUG_
         // DEBUG: print the parameters and result
diff --git a/MMS24_25.h b/MMS24-25.h
similarity index 100%
rename from MMS24_25.h
rename to MMS24-25.h
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5da918e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+CC=gcc
+SOURCE_FILE=MMS24-25.c
+OPTS=-lm
+
+all: testInterpolation
+
+testInterpolation:
+	$(CC) testInterpolation.c $(SOURCE_FILE) -o testInterpolation $(OPTS)
\ No newline at end of file
diff --git a/testInterpolation b/testInterpolation
new file mode 100755
index 0000000000000000000000000000000000000000..46d12507c37e640399ae1a2af155a9bf06aaf52e
GIT binary patch
literal 16040
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
Ryv}ETl?wbTE&~@U{sUolQ$+v(

literal 0
HcmV?d00001

diff --git a/testInterpolation.c b/testInterpolation.c
new file mode 100644
index 0000000..5512a41
--- /dev/null
+++ b/testInterpolation.c
@@ -0,0 +1,31 @@
+//
+// Created by frederik on 1/11/25.
+//
+
+#include "MMS24-25.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+
+int main (int iArgC, char** ppcArgV){
+    int iRes = -1;
+
+    if (iArgC != 6){
+        printf("Number of Arguments != 6\n");
+        printf("Usage testInterpolation <dX1> <dY1> <dX2> <dY2> <dX>\n");
+        exit(iRes);
+    };
+
+    double dX1 = atof(ppcArgV[1]);
+    double dY1 = atof(ppcArgV[2]);
+    double dX2 = atof(ppcArgV[3]);
+    double dY2 = atof(ppcArgV[4]);
+    double dX = atof(ppcArgV[5]);
+
+    for(int i=0; i<4; i++){
+        double dRes = interpolateLine(dX1, dY1, dX2, dY2, dX+(double)i);
+        printf ("%f,%f\n",dX+(double)i,dRes);
+    }
+
+    return iRes;
+}