From 7ca0e4c33ae8b1f43a8b85106ac4468e9d700935 Mon Sep 17 00:00:00 2001
From: Alnotz <alnotz@protonmail.com>
Date: Tue, 23 May 2023 09:34:07 +0200
Subject: [PATCH] package updated
---
META-INF/MANIFEST.MF | 2 +-
fr/alnotz/{ => quaternion}/Application.java | 4 +++-
fr/alnotz/{ => quaternion}/Dual.java | 2 +-
fr/alnotz/{ => quaternion}/DualQuaternion.java | 10 +++++++---
fr/alnotz/{ => quaternion}/IsDual.java | 2 +-
fr/alnotz/{ => quaternion}/IsDualQuaternion.java | 3 ++-
fr/alnotz/{ => quaternion}/IsQuaternion.java | 2 +-
fr/alnotz/{ => quaternion}/Quaternion.java | 2 +-
8 files changed, 17 insertions(+), 10 deletions(-)
rename fr/alnotz/{ => quaternion}/Application.java (63%)
rename fr/alnotz/{ => quaternion}/Dual.java (98%)
rename fr/alnotz/{ => quaternion}/DualQuaternion.java (96%)
rename fr/alnotz/{ => quaternion}/IsDual.java (89%)
rename fr/alnotz/{ => quaternion}/IsDualQuaternion.java (94%)
rename fr/alnotz/{ => quaternion}/IsQuaternion.java (93%)
rename fr/alnotz/{ => quaternion}/Quaternion.java (99%)
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 1642dc6..9d0eee1 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
-Main-Class: fr.alnotz.Application
+Main-Class: fr.alnotz.quaternion.Application
diff --git a/fr/alnotz/Application.java b/fr/alnotz/quaternion/Application.java
similarity index 63%
rename from fr/alnotz/Application.java
rename to fr/alnotz/quaternion/Application.java
index cac71be..8edbb61 100644
--- a/fr/alnotz/Application.java
+++ b/fr/alnotz/quaternion/Application.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public class Application {
public static void main(String[] args){
@@ -7,5 +7,7 @@ public class Application {
System.out.println(dual);
Quaternion quaternion = new Quaternion(21, 45, 7, -9);
System.out.println(quaternion);
+ DualQuaternion dualQuaternion = new DualQuaternion(quaternion, quaternion.conjugate());
+ System.out.println(dualQuaternion);
}
}
diff --git a/fr/alnotz/Dual.java b/fr/alnotz/quaternion/Dual.java
similarity index 98%
rename from fr/alnotz/Dual.java
rename to fr/alnotz/quaternion/Dual.java
index a991730..d810d39 100644
--- a/fr/alnotz/Dual.java
+++ b/fr/alnotz/quaternion/Dual.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public class Dual implements IsDual{
private double r;
diff --git a/fr/alnotz/DualQuaternion.java b/fr/alnotz/quaternion/DualQuaternion.java
similarity index 96%
rename from fr/alnotz/DualQuaternion.java
rename to fr/alnotz/quaternion/DualQuaternion.java
index dce811e..0383ebc 100644
--- a/fr/alnotz/DualQuaternion.java
+++ b/fr/alnotz/quaternion/DualQuaternion.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public class DualQuaternion implements IsDualQuaternion {
private double rs;
@@ -254,9 +254,8 @@ public class DualQuaternion implements IsDualQuaternion {
this.ri * dualQuaternion.getDJ() + this.di * dualQuaternion.getRJ() -
this.rj * dualQuaternion.getDI() - this.dj * dualQuaternion.getRI() +
this.rk * dualQuaternion.getDS() + this.dk * dualQuaternion.getRS();
- IsDualQuaternion newDQ = new DualQuaternion(newRS, newRI, newRJ, newRK,
+ return new DualQuaternion(newRS, newRI, newRJ, newRK,
newDS, newDI, newDJ, newDK);
- return newDQ;
}
@Override
@@ -270,4 +269,9 @@ public class DualQuaternion implements IsDualQuaternion {
this.dj == dualQuaternion.getDJ() &&
this.dk == dualQuaternion.getDK();
}
+ public String toString(){
+ return String.format("%+f %+fi %+fj %+fk %+fε %+fiε %+fjε %+fkε\n",
+ this.rs, this.ri, this.rj, this.rk,
+ this.ds, this.di, this.dj, this.dk);
+ }
}
diff --git a/fr/alnotz/IsDual.java b/fr/alnotz/quaternion/IsDual.java
similarity index 89%
rename from fr/alnotz/IsDual.java
rename to fr/alnotz/quaternion/IsDual.java
index c704f60..117bd65 100644
--- a/fr/alnotz/IsDual.java
+++ b/fr/alnotz/quaternion/IsDual.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public interface IsDual {
double getR();
diff --git a/fr/alnotz/IsDualQuaternion.java b/fr/alnotz/quaternion/IsDualQuaternion.java
similarity index 94%
rename from fr/alnotz/IsDualQuaternion.java
rename to fr/alnotz/quaternion/IsDualQuaternion.java
index 2b58437..318de37 100644
--- a/fr/alnotz/IsDualQuaternion.java
+++ b/fr/alnotz/quaternion/IsDualQuaternion.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public interface IsDualQuaternion {
IsQuaternion getR();
@@ -32,4 +32,5 @@ public interface IsDualQuaternion {
IsDualQuaternion plus(IsDualQuaternion dualQuaternion);
IsDualQuaternion times(IsDualQuaternion dualQuaternion);
boolean equals(IsDualQuaternion dualQuaternion);
+ String toString();
}
diff --git a/fr/alnotz/IsQuaternion.java b/fr/alnotz/quaternion/IsQuaternion.java
similarity index 93%
rename from fr/alnotz/IsQuaternion.java
rename to fr/alnotz/quaternion/IsQuaternion.java
index 2981461..d583ece 100644
--- a/fr/alnotz/IsQuaternion.java
+++ b/fr/alnotz/quaternion/IsQuaternion.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public interface IsQuaternion {
double getS();
diff --git a/fr/alnotz/Quaternion.java b/fr/alnotz/quaternion/Quaternion.java
similarity index 99%
rename from fr/alnotz/Quaternion.java
rename to fr/alnotz/quaternion/Quaternion.java
index 6982151..71e8621 100644
--- a/fr/alnotz/Quaternion.java
+++ b/fr/alnotz/quaternion/Quaternion.java
@@ -1,4 +1,4 @@
-package fr.alnotz;
+package fr.alnotz.quaternion;
public class Quaternion implements IsQuaternion{
private double s;