From 098bc4b2167990aa89efdcac6aad2daf011d08b5 Mon Sep 17 00:00:00 2001 From: Giacomo Radaelli Date: Sat, 15 Apr 2023 15:43:25 +0200 Subject: [PATCH 1/2] Aggiunto Circuito --- Circuito/.gitignore | 29 ++++++++ Circuito/.idea/.gitignore | 3 + Circuito/.idea/misc.xml | 6 ++ Circuito/.idea/modules.xml | 8 +++ Circuito/.idea/uiDesigner.xml | 124 ++++++++++++++++++++++++++++++++ Circuito/.idea/vcs.xml | 6 ++ Circuito/Circuito.iml | 11 +++ Circuito/src/Circuit.java | 3 + Circuito/src/CircuitTester.java | 15 ++++ Circuito/src/Parallel.java | 27 +++++++ Circuito/src/Resistor.java | 17 +++++ Circuito/src/Serial.java | 27 +++++++ 12 files changed, 276 insertions(+) create mode 100644 Circuito/.gitignore create mode 100644 Circuito/.idea/.gitignore create mode 100644 Circuito/.idea/misc.xml create mode 100644 Circuito/.idea/modules.xml create mode 100644 Circuito/.idea/uiDesigner.xml create mode 100644 Circuito/.idea/vcs.xml create mode 100644 Circuito/Circuito.iml create mode 100644 Circuito/src/Circuit.java create mode 100644 Circuito/src/CircuitTester.java create mode 100644 Circuito/src/Parallel.java create mode 100644 Circuito/src/Resistor.java create mode 100644 Circuito/src/Serial.java diff --git a/Circuito/.gitignore b/Circuito/.gitignore new file mode 100644 index 0000000..f68d109 --- /dev/null +++ b/Circuito/.gitignore @@ -0,0 +1,29 @@ +### IntelliJ IDEA ### +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Circuito/.idea/.gitignore b/Circuito/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Circuito/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Circuito/.idea/misc.xml b/Circuito/.idea/misc.xml new file mode 100644 index 0000000..03f397c --- /dev/null +++ b/Circuito/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Circuito/.idea/modules.xml b/Circuito/.idea/modules.xml new file mode 100644 index 0000000..ecb9082 --- /dev/null +++ b/Circuito/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Circuito/.idea/uiDesigner.xml b/Circuito/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/Circuito/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Circuito/.idea/vcs.xml b/Circuito/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Circuito/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Circuito/Circuito.iml b/Circuito/Circuito.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Circuito/Circuito.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Circuito/src/Circuit.java b/Circuito/src/Circuit.java new file mode 100644 index 0000000..0444bc1 --- /dev/null +++ b/Circuito/src/Circuit.java @@ -0,0 +1,3 @@ +public interface Circuit { + public double getResistance(); +} diff --git a/Circuito/src/CircuitTester.java b/Circuito/src/CircuitTester.java new file mode 100644 index 0000000..969eb2e --- /dev/null +++ b/Circuito/src/CircuitTester.java @@ -0,0 +1,15 @@ +public class CircuitTester { + public static void main(String[] args) { + Serial circuito = new Serial(); + + circuito.addCircuit(new Resistor(10)); + + Parallel p1 = new Parallel(); + p1.addCircuit(new Resistor(20)); + p1.addCircuit(new Resistor(50)); + + circuito.addCircuit(p1); + + System.out.println(circuito.getResistance()); + } +} \ No newline at end of file diff --git a/Circuito/src/Parallel.java b/Circuito/src/Parallel.java new file mode 100644 index 0000000..c7c5d97 --- /dev/null +++ b/Circuito/src/Parallel.java @@ -0,0 +1,27 @@ +import java.util.ArrayList; + +public class Parallel implements Circuit { + private final ArrayList parallelo; + + public Parallel() { + parallelo = new ArrayList<>(); + } + + public void addCircuit(Circuit c) { + parallelo.add(c); + } + + @Override + public double getResistance() { + double resEq = 0; + for (Circuit c : parallelo) { + resEq += 1.0 / c.getResistance(); + } + return 1.0/resEq; + } + + @Override + public String toString() { + return "Parallel{" + parallelo + '}'; + } +} diff --git a/Circuito/src/Resistor.java b/Circuito/src/Resistor.java new file mode 100644 index 0000000..d2824dc --- /dev/null +++ b/Circuito/src/Resistor.java @@ -0,0 +1,17 @@ +public class Resistor implements Circuit { + private final double resistance; + + public Resistor(double resistance) { + this.resistance = resistance; + } + + @Override + public double getResistance() { + return resistance; + } + + @Override + public String toString() { + return "" + resistance; + } +} diff --git a/Circuito/src/Serial.java b/Circuito/src/Serial.java new file mode 100644 index 0000000..c090cee --- /dev/null +++ b/Circuito/src/Serial.java @@ -0,0 +1,27 @@ +import java.util.ArrayList; + +public class Serial implements Circuit { + private final ArrayList serie; + + public Serial() { + serie = new ArrayList<>(); + } + + public void addCircuit(Circuit c) { + serie.add(c); + } + + @Override + public double getResistance() { + double resEq = 0; + for (Circuit c : serie) { + resEq += c.getResistance(); + } + return resEq; + } + + @Override + public String toString() { + return "Serial{" + serie + '}'; + } +} From 4a5f95be99e725624acb876c6bd45868b63ea102 Mon Sep 17 00:00:00 2001 From: Giacomo Radaelli Date: Sat, 15 Apr 2023 15:43:43 +0200 Subject: [PATCH 2/2] Aggiunto DataSet misurabile --- .../DataSet/src/noarray/DataSet.java | 48 +++++++++++++++++++ .../DataSet/src/noarray/Misurabile.java | 13 +++++ .../DataSet/src/noarray/MyMis.java | 23 +++++++++ .../DataSet/src/noarray/Tester.java | 21 ++++++++ 4 files changed, 105 insertions(+) create mode 100644 NetBeans Projects/DataSet/src/noarray/DataSet.java create mode 100644 NetBeans Projects/DataSet/src/noarray/Misurabile.java create mode 100644 NetBeans Projects/DataSet/src/noarray/MyMis.java create mode 100644 NetBeans Projects/DataSet/src/noarray/Tester.java diff --git a/NetBeans Projects/DataSet/src/noarray/DataSet.java b/NetBeans Projects/DataSet/src/noarray/DataSet.java new file mode 100644 index 0000000..8159731 --- /dev/null +++ b/NetBeans Projects/DataSet/src/noarray/DataSet.java @@ -0,0 +1,48 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package noarray; + +import java.util.Arrays; + +/** + * + * @author gicorada + */ +public class DataSet { + private int dim; + private T min; + private T max; + private double somma = 0; + + public DataSet(T n) { + max = n; + min = n; + somma = n.getMisura(); + dim++; + } + + public void add(T n) { + if(n.getMisura() < min.getMisura()) min = n; + if(n.getMisura() > min.getMisura()) max = n; + somma += n.getMisura(); + dim++; + } + + public double media() { + return 1.0*somma/dim; + } + + public T min() { + return min; + } + + public T max() { + return max; + } + + public double getScarto() { + return max.getMisura() - min.getMisura(); + } +} diff --git a/NetBeans Projects/DataSet/src/noarray/Misurabile.java b/NetBeans Projects/DataSet/src/noarray/Misurabile.java new file mode 100644 index 0000000..d119078 --- /dev/null +++ b/NetBeans Projects/DataSet/src/noarray/Misurabile.java @@ -0,0 +1,13 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template + */ +package noarray; + +/** + * + * @author gicorada + */ +public interface Misurabile { + double getMisura(); +} diff --git a/NetBeans Projects/DataSet/src/noarray/MyMis.java b/NetBeans Projects/DataSet/src/noarray/MyMis.java new file mode 100644 index 0000000..eb026b1 --- /dev/null +++ b/NetBeans Projects/DataSet/src/noarray/MyMis.java @@ -0,0 +1,23 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package noarray; + +/** + * + * @author gicorada + */ +public class MyMis implements Misurabile { + private double misura; + + public MyMis(double misura) { + this.misura = misura; + } + + @Override + public double getMisura() { + return misura; + } + +} diff --git a/NetBeans Projects/DataSet/src/noarray/Tester.java b/NetBeans Projects/DataSet/src/noarray/Tester.java new file mode 100644 index 0000000..97119b7 --- /dev/null +++ b/NetBeans Projects/DataSet/src/noarray/Tester.java @@ -0,0 +1,21 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package noarray; + +/** + * + * @author gicorada + */ +public class Tester { + public static void main(String[] args) { + DataSet data = new DataSet(new MyMis(50)); + + data.add(new MyMis(10)); + + data.add(new MyMis(100)); + + System.out.println(data.max().getMisura() + " " + data.min().getMisura() + " " + data.media() + " " + data.getScarto()); + } +}