JAVA-OO3331

app.py

@@ -216,15 +216,13 @@ class JavaStructuralEvaluator:
         }
 
 class CompetencyEvaluator:
-    """Avaliador baseado em competências"""
     def __init__(self):
         self.rubric = {
-            "syntax_correctness": 50,  # Corretude sintática
-            "competencies": 50         # Competências demonstradas
+            "syntax_correctness": 50,
+            "competencies": 50
         }
     
     def analyze_syntax_correctness(self, code: str) -> Tuple[float, List[str]]:
-        """Analisa corretude sintática (50 pontos)"""
         score = 0
         feedback = []
         
@@ -244,12 +242,17 @@ class CompetencyEvaluator:
             if declarations:
                 score += 5
                 feedback.append("✓ Declarações de variáveis sintáticamente corretas")
-                if any(d.type.name in ['int', 'double', 'String', 'boolean'] for d in declarations):
+                if any(hasattr(d, 'type') and d.type.name in ['int', 'double', 'String', 'boolean'] for d in declarations):
                     score += 5
                     feedback.append("✓ Tipos de dados usados corretamente")
 
             # 3. Expressões e Operadores (10 pontos)
-            if list(tree.filter(javalang.tree.BinaryOperation)):
+            binary_operations = []
+            for path, node in tree.filter(javalang.tree.BinaryOperation):
+                if hasattr(node, 'operator'):
+                    binary_operations.append(node)
+            
+            if binary_operations:
                 score += 10
                 feedback.append("✓ Expressões e operadores usados corretamente")
 
@@ -279,7 +282,6 @@ class CompetencyEvaluator:
         return score, feedback
 
     def analyze_competencies(self, code: str) -> Tuple[float, List[str]]:
-        """Analisa competências demonstradas (50 pontos)"""
         score = 0
         feedback = []
         
@@ -293,35 +295,56 @@ class CompetencyEvaluator:
                 'while': list(tree.filter(javalang.tree.WhileStatement))
             }
             
-            appropriate_use = True
             for struct_type, instances in structures.items():
                 if instances:
-                    if struct_type == 'for' and any('length' in str(inst) for inst in instances):
-                        score += 5
-                        feedback.append("✓ Uso adequado de for para iteração em arrays")
-                    elif struct_type == 'while' and any('hasNext' in str(inst) for inst in instances):
-                        score += 5
-                        feedback.append("✓ Uso adequado de while para leitura de dados")
+                    if struct_type == 'for':
+                        for path, node in tree.filter(javalang.tree.ForStatement):
+                            if any('length' in str(getattr(node, attr, '')) for attr in dir(node)):
+                                score += 5
+                                feedback.append("✓ Uso adequado de for para iteração em arrays")
+                                break
+                    elif struct_type == 'while':
+                        for path, node in tree.filter(javalang.tree.WhileStatement):
+                            if any('hasNext' in str(getattr(node, attr, '')) for attr in dir(node)):
+                                score += 5
+                                feedback.append("✓ Uso adequado de while para leitura de dados")
+                                break
                     else:
                         score += 5
                         feedback.append(f"✓ Uso apropriado de {struct_type}")
 
             # 2. Manipulação de Dados (15 pontos)
-            operations = list(tree.filter(javalang.tree.BinaryOperation))
-            if operations:
-                if any(op.operator in ['*', '/', '+', '-'] for op in operations):
+            binary_operations = []
+            for path, node in tree.filter(javalang.tree.BinaryOperation):
+                if hasattr(node, 'operator'):
+                    binary_operations.append(node)
+            
+            if binary_operations:
+                arithmetic_ops = [op for op in binary_operations if hasattr(op, 'operator') and op.operator in ['*', '/', '+', '-']]
+                comparison_ops = [op for op in binary_operations if hasattr(op, 'operator') and op.operator in ['>', '<', '>=', '<=', '==']]
+                assignment_ops = [op for op in binary_operations if hasattr(op, 'operator') and '=' in op.operator]
+                
+                if arithmetic_ops:
                     score += 5
                     feedback.append("✓ Cálculos implementados corretamente")
-                if any(op.operator in ['>', '<', '>=', '<=', '=='] for op in operations):
+                if comparison_ops:
                     score += 5
                     feedback.append("✓ Comparações implementadas corretamente")
-                if any('=' in str(op) for op in operations):
+                if assignment_ops:
                     score += 5
                     feedback.append("✓ Atribuições implementadas corretamente")
 
             # 3. Clareza e Organização (10 pontos)
             # Verificar nomes significativos
-            if all(len(decl.declarators[0].name) > 1 for _, decl in tree.filter(javalang.tree.LocalVariableDeclaration)):
+            has_meaningful_names = True
+            for path, node in tree.filter(javalang.tree.LocalVariableDeclaration):
+                if hasattr(node, 'declarators') and node.declarators:
+                    for declarator in node.declarators:
+                        if hasattr(declarator, 'name') and len(declarator.name) <= 1:
+                            has_meaningful_names = False
+                            break
+            
+            if has_meaningful_names:
                 score += 5
                 feedback.append("✓ Nomes de variáveis significativos")
             
@@ -332,9 +355,8 @@ class CompetencyEvaluator:
                 feedback.append("✓ Código bem documentado")
 
             # 4. Resolução do Problema (10 pontos)
-            # Verificar se tem entrada, processamento e saída
             has_input = 'Scanner' in code
-            has_processing = bool(operations)
+            has_processing = bool(binary_operations)
             has_output = 'System.out' in code
             
             if has_input and has_output: