Merge branch 'master' of gitea.it:gicorada/java-scuola

.gitignore

@@ -29,3 +29,5 @@ hs_err_pid*
 /NetBeans Projects/esercizi/nbproject/private/
 /NetBeans Projects/esercizi/dist/
 /NetBeans Projects/esercizi/build/
+/NetBeans Projects/LineaCalcoli/nbproject/private/
+/NetBeans Projects/LineaCalcoli/build/

NetBeans Projects/LineaCalcoli/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="LineaCalcoli" default="default" basedir=".">
+    <description>Builds, tests, and runs the project LineaCalcoli.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="LineaCalcoli-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

NetBeans Projects/LineaCalcoli/manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

NetBeans Projects/LineaCalcoli/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=4bd1ec78
+build.xml.script.CRC32=9460592c
+build.xml.stylesheet.CRC32=f85dc8f2@1.105.0.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=4bd1ec78
+nbproject/build-impl.xml.script.CRC32=89302400
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.105.0.48

NetBeans Projects/LineaCalcoli/nbproject/project.properties

@@ -0,0 +1,95 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processor.options=
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/LineaCalcoli.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.jlink.dir=${dist.dir}/jlink
+dist.jlink.output=${dist.jlink.dir}/LineaCalcoli
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=11
+javac.target=11
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+# The jlink additional root modules to resolve
+jlink.additionalmodules=
+# The jlink additional command line parameters
+jlink.additionalparam=
+jlink.launcher=true
+jlink.launcher.name=LineaCalcoli
+main.class=lineacalcoli.LineaTest
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

NetBeans Projects/LineaCalcoli/nbproject/project.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>LineaCalcoli</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

NetBeans Projects/LineaCalcoli/src/lineacalcoli/Line.java

@@ -0,0 +1,92 @@
+package lineacalcoli;
+
+/**
+ *
+ * @author radaelli11353
+ */
+public class Line {
+    private double a;
+    private double b;
+    private double c;
+    
+    /**
+     * Costruttore per linea con punto e pendenza
+     * @param x1 X del punto fornito
+     * @param y1 Y del punto fornito
+     * @param m Pendenza
+     */
+    public Line(double x1, double y1, double m) {
+        a = -m;
+        b = 1;
+        c = y1 - m * x1;
+    }
+    
+    /**
+     * Costruttore per linea passante per due punti
+     * @param x1 X del primo punto
+     * @param y1 Y del primo punto
+     * @param x2 X del secondo punto
+     * @param y2 Y del secondo punto
+     */
+    public Line(double x1, double y1, double x2, double y2) {
+        a = (y2 - y1)/(x1 - x2);
+        b = 1;
+        c = (x2 * y1 - x1 * y2) / (x1 - x2);
+    }
+    
+    /**
+     * Costruttore per linea con pendenza e intersezione con y
+     * @param m Pendenza
+     * @param q Intersezione con l'asse delle y
+     */
+    public Line(double m, double q) {
+        a = -m;
+        b = 1;
+        c = -q;
+    }
+   
+    /**
+     * Costruttore per retta verticale
+     * @param k Costante che indica l'intersezione con x
+     */
+    public Line(double k) {
+        a = 1;
+        b = 0;
+        c = -k;
+    }
+
+    @Override
+    public String toString() {
+        return a + "," + b + "," + c;
+    }
+    
+    /**
+     * Metodo che controlla se c'è intersezione tra due rette (=non parallele)
+     * @param other Altra retta
+     * @return True se c'è intersezione, false se sono parallele
+     */
+    public boolean intersects(Line other) {
+        return !isParallel(other);
+    }
+    
+    /**
+     * Metodo che confronta l'uguaglianza tra due rette
+     * @param other Altra retta
+     * @return True se le rette sono uguali (sovrapposte)
+     */
+    public boolean equals(Line other) {
+        return a == other.a && b == other.b && c == other.c;
+    }
+    
+    /**
+     * Metodo che controlla se le rette sono parallele
+     * @param other Altra retta
+     * @return True se sono parallele, false se c'è intersezione
+     */
+    public boolean isParallel(Line other) {
+        double thisM = -a / b;
+        double otherM = -other.a / other.b;
+        
+        return thisM == otherM;
+    }
+}

NetBeans Projects/LineaCalcoli/src/lineacalcoli/LineaTest.java

@@ -0,0 +1,17 @@
+package lineacalcoli;
+
+/**
+ *
+ * @author radaelli11353
+ */
+public class LineaTest {
+    public static void main(String[] args) {
+        Line prova = new Line(2, 3);
+        Line other = new Line(2, 5);
+        
+        System.out.println(prova.intersects(other));
+        
+        
+        System.out.println(prova);
+    }
+}