resolved conflict

Author: AnuragAnalog

ArthimeticOperators.java

@@ -34,9 +34,9 @@ public static void main(String[] args) {
         System.out.println("a = " + +a);
 
         // Prefix increment
-        System.out.println("++a = " + (++a));
+        System.out.println("++c = " + (++c));
 
         // Prefix decrement
-        System.out.println("--a = " + (--a));
+        System.out.println("--d = " + (--d));
     }
 }

Calculator.java

@@ -0,0 +1,37 @@
+
+public class Calculator {
+    // This class contains methods to perform basic arithmetic operations
+    Calculator() {
+        System.out.println("Calculator object created");
+    }
+
+    public int add(int a, int b) {
+        return a + b;
+    }
+
+    public int subtract(int a, int b) {
+        return a - b;
+    }
+
+    public int multiply(int a, int b) {
+        return a * b;
+    }
+
+    public int divide(int a, int b) {
+        return a / b;
+    }
+
+    public int modulo(int a, int b) {
+        return a % b;
+    }
+
+    public static void main(String[] args) {
+        Calculator calculator = new Calculator();
+
+        System.out.println("Addition: " + calculator.add(10, 20));
+        System.out.println("Subtraction: " + calculator.subtract(10, 20));
+        System.out.println("Multiplication: " + calculator.multiply(10, 20));
+        System.out.println("Division: " + calculator.divide(10, 20));
+        System.out.println("Modulo: " + calculator.modulo(10, 7));
+    }
+}

CharacterClass.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Understanding "Character Class" in Java
 

ConditionalOperators.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 public class ConditionalOperators {
     public static void main(String[] args) {

Constructor.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Constructor
 // Parameterized constructor

DecisionMaking.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 public class DecisionMaking {
     public static void main(String[] args) {

EnhancedFor.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 public class EnhancedFor {
     public static void main(String[] args) {

Finalize.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 public class Finalize {
     public static void main(String[] args) {

HasA.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 class Name {
     String name;

Inheritance.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Inheritance in Java
 

InstanceOf.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 interface Human {}
 

Method.java

@@ -1,5 +1,4 @@
-import java.util.*;
-
+// Calling a simple method in Java
 public class Method {
     public static void main(String[] args) {
         System.out.println("Calling Simple Method");

NestedClasses.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Nested classes
 // * Two Types

Numbers.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Understanding different types of numbers classes in Java
 

Overloading.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Understanding Overloading
 // Overloading is a concept in Java where a class can have multiple methods with the same name but different parameters.

Overriding.java

@@ -1,4 +1,3 @@
-import java.util.*;
 
 // Understanding Overriding
 // Overriding is a concept in Java where a subclass can provide a specific implementation of a method that is already provided by its superclass.

README.md

@@ -203,3 +203,4 @@ public class Main {
     }
 }
 ```
+    * float

map.java

@@ -0,0 +1,36 @@
+import java.util.Map;
+import java.util.HashMap;
+
+public class map {
+    public Map<Integer, String> addElement(Map<Integer, String> map) {
+        map.put(1, "One");
+        map.put(2, "Two");
+        map.put(34, "Thirty Four");
+        map.put(4, "Four");
+        map.put(5, "Five");
+        map.put(6, "Six");
+        map.put(70, "Seventy");
+        map.put(8, "Eight");
+        map.put(99, "Ninety Nine");
+        map.put(100, "Hundred");
+
+        return map;
+    }
+    public static void main(String[] args) {
+        Map<Integer, String> m = new HashMap<Integer, String>();
+        map obj = new map();
+        m = obj.addElement(m);
+
+        System.out.println("Keys: " + m.keySet());
+        System.out.println("Values: " + m.values());
+
+        for (int k: m.keySet()) {
+            System.out.println("Key: " + k + ", Value: " + m.get(k));
+        }
+
+        System.out.println("Map of 1: " + m.get(1));
+        System.out.println("Map: " + m);
+    }
+
+
+}

set.java

@@ -0,0 +1,40 @@
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+public class set {
+    public static void main(String[] args) {
+        Set<Integer> set = new HashSet<Integer>();
+        Set<Integer> sset = new TreeSet<Integer>();
+
+        // Adding elements into the set
+        set.add(6);
+        set.add(7);
+        set.add(10);
+        set.add(10);
+        set.add(54);
+        set.add(87);
+        set.add(54);
+        set.add(43);
+
+        sset.addAll(set);
+
+        Iterator<Integer> it = set.iterator();
+
+        while (it.hasNext()) {
+            System.out.print(it.next() + " ");
+        }
+        System.out.println();
+
+        
+        for (int s : set) {
+            System.out.print(s + " ");
+        }
+        System.out.println();
+        
+        set.remove(7);
+        System.out.println("Set: " + set);
+        System.out.println("Sorted Set: " + sset);
+    }
+}