Merge pull request #23 from radevgit/zinc_phase3

Zinc phase3

Author: radevgit

.gitignore

@@ -5,7 +5,7 @@
 **/*.rs.bk
 clippy.txt
 /coverage/results
-/src/zinc/flatzinc
+/zinc
 
 # Binary executables and object files
 *.exe

CURRENT_STATUS.md

@@ -0,0 +1,78 @@
+# Selen FlatZinc Test Status - October 2, 2025
+
+## 🎉 Current Success Rate: **92.8%** (790/851 files)
+
+### Progress Summary
+- **Session Start**: 727/851 (85.4%)
+- **After Cumulative + Quick Wins**: 761/851 (89.4%)
+- **After Array Element Fix**: 790/851 (92.8%)
+- **Total Improvement**: +63 files (+7.4 percentage points)
+
+### Batch-by-Batch Results
+
+| Batch | Before | After | Change | Rate |
+|-------|--------|-------|--------|------|
+| 01 | 84/86 | 85/86 | +1 | 98.8% |
+| 02 | 65/86 | 76/86 | +11 | 88.4% |
+| 03 | 77/86 | 79/86 | +2 | 91.9% |
+| 04 | 79/86 | 80/86 | +1 | 93.0% |
+| 05 | 70/86 | 77/86 | +7 | 89.5% |
+| 06 | 78/86 | 82/86 | +4 | 95.3% |
+| 07 | 65/86 | 74/86 | +9 | 86.0% |
+| 08 | 75/86 | 81/86 | +6 | 94.2% |
+| 09 | 67/86 | 77/86 | +10 | 89.5% |
+| 10 | 67/81 | 79/81 | +12 | 97.5% |
+
+### Recent Changes (Array Element Fix)
+**Files Modified**: `src/flatzinc/mapper/constraints/element.rs`
+
+**Impact**: +29 files (761 → 790)
+
+**Changes Made**:
+- Updated `array_var_int_element` to use `get_var_or_const()` for index and value
+- Updated `array_int_element` to use `get_var_or_const()` for index and value  
+- Updated `array_var_bool_element` to use `get_var_or_const()` for index and value
+- Updated `array_bool_element` to use `get_var_or_const()` for index and value
+
+**What this enables**:
+- Support for `ArrayAccess` expressions in element constraints (e.g., `array[x[i]]`)
+- Support for integer/boolean literals in index/value positions
+- Simplified code by removing manual pattern matching
+
+### Known Remaining Issues (61 failures)
+
+#### High Priority (Quick Wins):
+1. **Parse Errors** (~5 files): "Expected Int, found IntLiteral(1)"
+   - Parser issue with type annotations
+
+2. **Domain Size Exceeded** (2 files): Variables with domains > 10M
+   - `arrow.fzn`: [123456789, 987654321] 
+   - `contains_array.fzn`: [0, 999999999]
+
+3. **Reified Constraint Issues** (~3 files):
+   - `int_eq_reif` with unsupported argument types
+   - `int_ne_reif` with unsupported argument types
+
+4. **Set Literals in Arrays** (2 files):
+   - `bus_scheduling_csplib.fzn`: SetLit in array elements
+   - `combinatorial_auction.fzn`: SetLit in array elements
+
+#### Medium Priority:
+5. **global_cardinality_low_up_closed** (1 file): Not implemented
+
+6. **IntLit in Specific Contexts** (1 file):
+   - `buckets.fzn`: IntLit(0) not accepted somewhere
+
+### Distance to Milestones
+- **90%**: ✅ ACHIEVED! (target was 765/851)
+- **95%**: Need +19 files (809/851)
+- **96%**: Need +27 files (817/851)
+
+### Next Steps Options
+A. **Push for 95%** - Fix parse errors + domain issues + reified constraints
+B. **Analyze remaining 61 failures** - Categorize and prioritize
+C. **Document current state** - Create comprehensive guide
+
+---
+*Last Updated: October 2, 2025*
+*Array element fix completed*

FAILURE_ANALYSIS.md

@@ -0,0 +1,190 @@
+# Failure Analysis - 65 Remaining Issues
+
+## Category Breakdown
+
+### 1. **Domain Size Exceeded** (21 files) ⚠️
+Variables with domains > 10,000,000 elements.
+
+**Files:**
+- arrow.fzn: [123456789, 987654321] (864M elements)
+- contains_array.fzn: [0, 999999999] (1B elements)
+- curious_set_of_integers.fzn: [0, 100000000] (100M elements)
+- digits_of_the_square.fzn: [1000000, 99980001] (98M elements)
+- divisible_by_9_trough_1.fzn: [0, 999999999] (1B elements)
+- enigma_1570.fzn: [0, 32461758] (32M elements)
+- enigma_portuguese_squares.fzn: [1, 1000000000] (1B elements)
+- euler_2.fzn: [0, 10000000] (10M elements)
+- euler_9.fzn: [0, 125000000] (125M elements)
+- four_power.fzn: [1, 64000000] (64M elements)
+- grocery.fzn: [0, 359425431] (359M elements)
+- magic_modulo_number.fzn: [0, 10000000] (10M elements)
+- number_square.fzn: [110000000, 199999999] (90M elements)
+- seven11.fzn: [0, 359425431] (359M elements)
+- shopping_basket2.fzn: [6, 30000015] (30M elements)
+- shopping_basket.fzn: [0, 10000435] (10M elements)
+- square_root_of_wonderful.fzn: [123454321, 999999999] (876M elements)
+
+**Solution:** Increase MAX_DOMAIN_SIZE or implement sparse domain representation
+
+### 2. **Parse Errors** (17 files) 🔴
+Parser issues with various constructs.
+
+**Type A - "Expected Int, found IntLiteral(1)"** (11 files):
+- bokus_competition.fzn (line 350)
+- common.fzn (line 173)
+- connected.fzn (line 78)
+- in_set.fzn (line 1)
+- open_alldifferent.fzn (line 4)
+- open_among.fzn (line 11)
+- open_atleast.fzn (line 9)
+- open_atmost.fzn (line 9)
+- open_global_cardinality.fzn (line 22)
+- open_global_cardinality_low_up.fzn (line 23)
+- roots_test.fzn (line 26)
+- set_covering4b.fzn (line 2)
+
+**Type B - "Expected RightBracket, found LeftParen"** (3 files):
+- packing.fzn (line 20976)
+- queens_viz.fzn (line 12)
+- seg_fault.fzn (line 2736)
+
+**Type C - Other** (3 files):
+- debruijn_no_repetition.fzn: Expected RightParen, found LeftParen
+- kaprekars_constant*.fzn (3 files): Unexpected token in expression: RightBrace
+- regular_test.fzn: Lexical Error - Unexpected character: '/'
+
+**Solution:** Fix parser to handle these edge cases
+
+### 3. **SetLit in Array Elements** (15 files) 🟡
+Array elements contain set literals like {1, 2, 3}.
+
+**Files:**
+- bus_scheduling_csplib.fzn
+- combinatorial_auction.fzn
+- exact_cover_dlx.fzn
+- hitting_set.fzn
+- itemset_mining.fzn
+- map_coloring_with_costs.fzn
+- maximal_independent_sets.fzn
+- mixing_party.fzn
+- number_of_regions.fzn
+- optimal_picking_elements_from_each_list.fzn
+- partial_latin_square.fzn
+- sat.fzn
+- scene_allocation.fzn
+- set_covering2.fzn
+- set_covering5.fzn
+
+**Solution:** Support SetLit in array literal expressions in mapper.rs
+
+### 4. **IntLit Mapping Errors** (6 files) 🟢 EASY FIX
+"Expected variable identifier or array access, got: IntLit(X)"
+
+**Files:**
+- buckets.fzn: IntLit(0)
+- einstein_opl.fzn: IntLit(1)
+- houses.fzn: IntLit(1)
+- lecture_series.fzn: IntLit(1)
+- olympic.fzn: IntLit(3)
+- timeslots_for_songs.fzn: IntLit(3)
+- zebra_inverse.fzn: IntLit(1)
+
+**Solution:** Find where get_var() is used instead of get_var_or_const()
+
+### 5. **ArrayAccess in Array Elements** (2 files) 🟡
+Array initialization contains array access like a[1].
+
+**Files:**
+- enigma_1575.fzn: ArrayAccess { array: "days", index: IntLit(3) }
+- locker.fzn: ArrayAccess { array: "a_d1", index: IntLit(1) }
+
+**Solution:** Support ArrayAccess in array literal expressions in mapper.rs
+
+### 6. **Reified Constraint Issues** (2 files) 🟡
+Unsupported argument types for reified constraints.
+
+**Files:**
+- battleships_6.fzn: int_eq_reif (line 1509)
+- bug_unsat.fzn: int_ne_reif (line 7488)
+
+**Solution:** Check and fix reified constraint mappers
+
+### 7. **Unsupported Constraints** (1 file) 🟠
+Not implemented.
+
+**Files:**
+- bobs_sale.fzn: global_cardinality_low_up_closed
+
+**Solution:** Implement this global constraint
+
+### 8. **Other Mapping Errors** (1 file) ��
+Specific mapping issues.
+
+**Files:**
+- smullyan_lion_and_unicorn.fzn: Expected array literal in array_bool_element
+
+**Solution:** Investigate specific case
+
+---
+
+## Priority Ranking
+
+### 🟢 HIGH PRIORITY (Quick Wins - Est. +7 files)
+1. **Fix IntLit mapping errors** (7 files)
+   - Find remaining get_var() that should be get_var_or_const()
+   - Estimated effort: 10 minutes
+   - Impact: +7 files
+
+### 🟡 MEDIUM PRIORITY (Est. +17 files)
+2. **Support SetLit in arrays** (15 files)
+   - Add SetLit case in array literal handling
+   - Estimated effort: 30 minutes
+   - Impact: +15 files
+
+3. **Support ArrayAccess in arrays** (2 files)
+   - Add ArrayAccess case in array literal handling
+   - Estimated effort: 15 minutes
+   - Impact: +2 files
+
+### 🟠 LOW PRIORITY (Est. +3 files)
+4. **Fix reified constraints** (2 files)
+   - Debug int_eq_reif and int_ne_reif
+   - Estimated effort: 30 minutes
+   - Impact: +2 files
+
+5. **Implement global_cardinality_low_up_closed** (1 file)
+   - Estimated effort: 1 hour
+   - Impact: +1 file
+
+### ⚠️ DEFERRED (21 files - architectural decision needed)
+6. **Domain size limit**
+   - Requires architectural change (sparse domains or higher limit)
+   - Estimated effort: 2-4 hours
+   - Impact: +21 files
+
+### 🔴 COMPLEX (17 files - parser work)
+7. **Fix parser errors**
+   - Requires parser fixes for edge cases
+   - Estimated effort: 2-3 hours
+   - Impact: +17 files
+
+---
+
+## Recommended Next Steps
+
+**Option A: Quick Push to 95%** (Recommended)
+1. Fix IntLit mapping errors → 797/851 (93.7%)
+2. Support SetLit in arrays → 812/851 (95.4%) ✅ **95% ACHIEVED!**
+
+**Option B: Maximum Impact**
+1. Do Option A (Quick push to 95%)
+2. Support ArrayAccess in arrays → 814/851 (95.7%)
+3. Fix reified constraints → 816/851 (95.9%)
+
+**Option C: Complete Coverage** (Long term)
+- All of Option B
+- Implement missing constraint
+- Fix parser errors
+- Address domain size limit
+→ Target: 851/851 (100%)
+

README.md

@@ -24,7 +24,7 @@ This library provides efficient algorithms and data structures for solving const
 - **Conditional**: `if_then(condition, constraint)`, `if_then_else(condition, then_constraint, else_constraint)`
 
 **Programmatic version of constraints**
-```
+```rust
 m.new(x.lt(y));                        // x < y
 m.new(y.le(z));                        // y <= z
 m.new(z.gt(5));                        // z > 5
@@ -35,7 +35,7 @@ m.new(z.div(y).ne(0));                 // z / y != 0
 ```
 
 **Mathematical syntax with post! macro**
-```
+```rust
 post!(m, x < y);                        // x < y
 post!(m, y <= z);                       // y <= z
 post!(m, z > int(5));                   // z > 5
@@ -45,6 +45,16 @@ post!(m, x * y == int(12));             // x * y == 12
 post!(m, z / y != int(0));              // z / y != 0
 ```
 
+**Import FlatZinc `.fzn` file**
+```rust
+use selen::prelude::*;
+let mut model = Model::default();
+model.from_flatzinc_file("puzzle.fzn")?;
+let solution = model.solve()?;
+println!("Solution: {:?}", solution);
+```
+
+
 ## Installation
 
 Add this to your `Cargo.toml`:
@@ -54,6 +64,8 @@ Add this to your `Cargo.toml`:
 selen = "0.8.6"
 ```
 
+## Examples
+
 ```
 🧩 Solving Platinum Blonde puzzle:
 📊 Puzzle stats: 17 clues given, 64 empty cells
@@ -79,8 +91,6 @@ Puzzle:                                 Solution:
 
 ```
 
-## Examples
-
 ### Core Problems
 ```bash
 cargo run --release --example sudoku                 # Classic 9x9 Sudoku solver

comment_passing_tests.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Run each batch and capture which tests pass/fail
+for batch in {01..10}; do
+    echo "Processing batch $batch..."
+    
+    # Run the test and capture output
+    test_output=$(cargo test --release --test test_flatzinc_batch_$batch -- --nocapture 2>&1)
+    
+    # Extract passing test files (lines with ✓)
+    passing_tests=$(echo "$test_output" | grep "✓" | sed 's/.*✓ //' | sed 's/\.fzn.*/\.fzn/')
+    
+    # Get the test file path
+    test_file="tests/test_flatzinc_batch_${batch}.rs"
+    
+    if [ ! -f "$test_file" ]; then
+        echo "Warning: $test_file not found"
+        continue
+    fi
+    
+    # Create backup
+    cp "$test_file" "${test_file}.backup"
+    
+    # Comment out each passing test
+    while IFS= read -r passing_test; do
+        if [ -n "$passing_test" ]; then
+            # Escape special characters for sed
+            escaped_test=$(echo "$passing_test" | sed 's/[.[\*^$()+?{|]/\\&/g')
+            
+            # Comment out the line with this test file
+            sed -i "s|^\(.*\"$escaped_test\".*\)|// \1  // ✓ PASSING|" "$test_file"
+        fi
+    done <<< "$passing_tests"
+    
+    echo "  ✓ Commented out passing tests in $test_file"
+done
+
+echo ""
+echo "Done! All passing tests have been commented out."
+echo "To restore, run: for f in tests/test_flatzinc_batch_*.rs.backup; do mv \"\$f\" \"\${f%.backup}\"; done"