Merge pull request 'lab_branch' (#1) from lab_branch into main

Reviewed-on: #1

DS/C/Lab/Week4/circq.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#define MAX_SIZE 5
+#define MAX_SIZE 4
 
 int queue[MAX_SIZE];
 int front = 0;
@@ -8,7 +8,7 @@ int rear = 0;
 
 void enqueue(int data) {
     if ((rear + 1) % MAX_SIZE == front) {
-        printf("Queue is full\n");
+        printf("\n\nQueue is full\n\n\n");
         return;
     }
     queue[rear] = data;
@@ -41,11 +41,12 @@ void printQueue() {
 int main() {
     int choice, data;
     while (1) {
+        printf("Choose the Circular Queue option you would like to perform:\n");
         printf("1. Enqueue\n2. Dequeue\n3. Print Queue\n4. Exit\n");
         scanf("%d", &choice);
         switch (choice) {
             case 1:
-                printf("Enter data: ");
+                printf("Enter the value for the latest element: ");
                 scanf("%d", &data);
                 enqueue(data);
                 break;
@@ -58,6 +59,9 @@ int main() {
                 break;
             case 4:
                 return 0;
+            default:
+                printf("Invalid choice.");
+                return -1;
         }
     }
 }

DS/C/Lab/Week4/fasttranspose.c

@@ -31,10 +31,19 @@ int main() {
     struct Element b[MAX_TERMS];
     int m = 4, n = 3, num = 4;
 
+    printf("The Original Matrix is:\n\n");
+    printf("row     col     val\n");
+    for (int i = 0; i < num; i++)
+        printf("%d\t%d\t%d\n", a[i].row, a[i].col, a[i].value);
+
+    printf("\n\n");
     fastTranspose(a, b, m, n, num);
 
+    printf("The Transpose Matrix is:\n\n");
+    printf("row     col     val\n");
     for (int i = 0; i < num; i++)
-        printf("%d %d %d\n", b[i].row, b[i].col, b[i].value);
+        printf("%d\t%d\t%d\n", b[i].row, b[i].col, b[i].value);
 
     return 0;
 }
+

OOP/Java/Lab/Week3/Armstrong.java

@@ -1,37 +1,26 @@
 import java.util.Scanner;
-import java.lang.Math;
 
 class Armstrong {
-    public static void main(String args[]){
+
+    public static void main(String[] args) {
         Scanner sc = new Scanner(System.in);
 
-        int a,b,digit;
+        System.out.println("Enter a number");
-        int digisum=0;
-        int c=0;
 
-        System.out.println("Enter the number you went to check for Armstrong-ness:");
+        int n = sc.nextInt();
-        a = sc.nextInt();
+        int b = String.valueOf(n).length();
-    
+        int sum = 0;
-        b = a;
+        int temp = n;
-
+        while (temp > 0) {
-        while(b!=0){
+            int r = temp % 10;
-            c++;
+            sum += Math.pow(r, b);
-            b/=10;
+            temp /= 10;
         }
-
+        if (sum == n) {
-        b = a;
+            System.out.println("The given number is an Armstrong Number.");
-
-        while(b!=0){
-            digit = b%10;
-            digisum += Math.pow(digit, c);
-            b /= 10;
-        }
-
-        if(digisum == a){
-            System.out.println("The number is an armstrong number.");
         } else {
-            System.out.println("The number is not an armstrong number.");
+            System.out.println("The given number is not an Armstrong Number.");
         }
-
+        sc.close();
     }
 }