Added auction work

src/Auction.java

@@ -1,22 +1,19 @@
 public class Auction {
 
-    double bid;
-    double price;
+    double price = 3;
     boolean isParetoEfficient = false;
 
-    void start()
-    {
-
+    String action(double bidA, double bidB) {
+        if (bidA > bidB) return "AgentA";
+        else return "AgentB";
     }
 
-    void end()
-    {
-
+    public double getPrice() {
+        return price;
     }
 
-    void updatePrice()
-    {
-
+    public void setPrice(double price) {
+        this.price = price;
     }
 
 }

src/Controller.java

@@ -14,8 +14,7 @@ public class Controller {
 
     Random r = new Random();
 
-    void adjustCeiling()
-    {
+    void adjustCeiling() {
         double solarEnergy = 0;
 
         if (currentWeather.isSunShines) {
@@ -28,6 +27,10 @@ void adjustCeiling()
 
         energyCeiling = solarEnergy + additionalEnergy;
 
+        System.out.println("Solar energy:" + solarEnergy);
+        System.out.println("Additional energy:" + additionalEnergy);
+        System.out.println("Total energy:" + energyCeiling);
+
     }
 
 
@@ -36,10 +39,8 @@ public void setCurrentWeather(Weather currentWeather) {
     }
 
 
-    void makeStep()
-    {
-
-
+    void makeStep() {
+        adjustCeiling();
 
 
     }

src/Heater.java

@@ -6,48 +6,44 @@ public class Heater {
     int lowLimit;
     int upLimit;
     double consumptionCoefficient;
-
+    double currentTemperature;
+
 
     Weather currentWeather;
 
 
-    public Heater (double consumptionCoefficient, int lowLimit, int upLimit)
-    {
+    public Heater(double consumptionCoefficient, int lowLimit, int upLimit) {
         this.lowLimit = lowLimit;
         this.upLimit = upLimit;
         this.consumptionCoefficient = consumptionCoefficient;
     }
 
 
-    public ArrayList<Double> computeEnergyDemand (double currentTemperature)
-    {
-       ArrayList<Double> energies = new ArrayList<Double>();
-       for (int i = lowLimit; i >= upLimit; i++) {
+    public ArrayList<Double> computeEnergyDemand(double currentTemperature) {
+        ArrayList<Double> energies = new ArrayList<Double>();
+        for (int i = lowLimit; i >= upLimit; i++) {
 
-           double energy = consumptionCoefficient + 0.5 * (i - currentTemperature);
-           energies.add(energy);
-       }
-       return energies;
+            double energy = consumptionCoefficient + 0.5 * (i - currentTemperature);
+            energies.add(energy);
+        }
+        return energies;
     }
 
     public void setCurrentWeather(Weather currentWeather) {
         this.currentWeather = currentWeather;
     }
 
 
-    public void heat(double currentTemperature)
-    {
+    public void heat(double currentTemperature) {
 
 
     }
 
-    public void getCredits()
-    {
+    public void getCredits() {
 
     }
 
-    public void getEnergy()
-    {
+    public void getEnergy() {
 
     }
 

src/Main.java

@@ -12,20 +12,31 @@ public class Main {
     private static final int lowLimitB = 20;
     private static final int upLimitB = 23;
 
-    private static Heater agentA = new Heater(consumtionCoeficintA, lowLimitA, upLimitA);;
-    private static Heater agentB = new Heater(consumtionCoeficintB, lowLimitB, upLimitB);;
-    private static Controller agentC = new Controller();;
+    private static Heater agentA = new Heater(consumtionCoeficintA, lowLimitA, upLimitA);
+    ;
+    private static Heater agentB = new Heater(consumtionCoeficintB, lowLimitB, upLimitB);
+    ;
+    private static Controller agentC = new Controller();
+    ;
     private static ArrayList<Weather> weatherSet = new ArrayList<Weather>();
 
     public static void main(String[] args) {
 
         populateWeatherSet();
+        int i = 0;
+
+        for (Weather weatherItem : weatherSet) {
+            System.out.println("Step: " + i);
 
-        for (Weather weatherItem: weatherSet)
-        {
             agentA.setCurrentWeather(weatherItem);
             agentB.setCurrentWeather(weatherItem);
             agentC.setCurrentWeather(weatherItem);
+            agentC.makeStep();
+
+            i++;
+
+            System.out.println("*********************************************************");
+            System.out.println();
         }
 
     }

src/SolarPanel.java

@@ -1,19 +1,17 @@
 public class SolarPanel {
 
-    private static final double peakPower  = 3;
+    private static final double peakPower = 3;
 
     double sunLevel;
     double amountOfGeneratedEnergy;
 
 
-    public void setSunLevel(double sunLevel)
-    {
+    public void setSunLevel(double sunLevel) {
         this.sunLevel = sunLevel;
 
     }
 
-    public void generateEnergy()
-    {
+    public void generateEnergy() {
         amountOfGeneratedEnergy = peakPower * sunLevel;
     }