resetup project

composite
Nicolas FRANCO 2 years ago
parent be4ffc52c7
commit 2f54869d62

3
.idea/.gitignore vendored

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="18 (2)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/TP_JavaFX.iml" filepath="$PROJECT_DIR$/TP_JavaFX.iml" />
</modules>
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib" level="project" />
</component>
</module>

@ -6,7 +6,7 @@ import javafx.beans.property.SimpleObjectProperty;
import java.util.Random; import java.util.Random;
public class Capteur implements CapteurAbstrait{ public class Capteur extends CapteurAbstrait {
private int id; private int id;
private String nom; private String nom;

@ -2,6 +2,6 @@ package model;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
public interface CapteurAbstrait { public abstract class CapteurAbstrait {
public ObjectProperty<Double> genTemp(); public abstract ObjectProperty<Double> genTemp();
} }

@ -5,7 +5,7 @@ import javafx.beans.property.SimpleObjectProperty;
import java.util.List; import java.util.List;
public class CapteurVirtuel implements CapteurAbstrait{ public class CapteurVirtuel extends CapteurAbstrait {
private List<CapteurAbstrait> capteurs; private List<CapteurAbstrait> capteurs;
@ -26,9 +26,9 @@ public class CapteurVirtuel implements CapteurAbstrait{
avg.setValue((double) 0); avg.setValue((double) 0);
for (CapteurAbstrait c: capteurs) { for (CapteurAbstrait c: capteurs) {
avg.setValue(c.genTemp() + avg.getValue()); avg.setValue(c.genTemp().getValue() + avg.getValue());
} }
avg.set(avg.getValue()/capteurs.size()); avg.set(avg.getValue()/capteurs.size());
return avg.getValue(); return avg;
} }
} }

Loading…
Cancel
Save