v0.0.13 Type conversation fix

Author: CameleoGrey

examples/object_oriented/nqueens/score/NQueensScoreCalculator.py

@@ -27,6 +27,7 @@ def __init__(self):
     def all_different(self, planning_entity_dfs, problem_fact_dfs):
 
         queens_df = planning_entity_dfs["queens"]
+        #print(queens_df)
         same_row_id_counts = (
             queens_df
             .lazy()

examples/object_oriented/nqueens/scripts/solve_nqueens.py

@@ -28,7 +28,7 @@
     #termination_strategy = ScoreLimit(score_to_compare=[0])
     agent = TabuSearch(neighbours_count=128, tabu_entity_rate=0.0, 
                        mutation_rate_multiplier=None, move_probas=None, 
-                       migration_frequency=1, termination_strategy=termination_strategy)
+                       migration_frequency=10, termination_strategy=termination_strategy)
 
     solver = Solver(domain_builder, cotwin_builder, agent, 
                     n_jobs=10, parallelization_backend="processing", #processing, threading 

greyjack/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "greyjack"
-version = "0.0.12"
+version = "0.0.13"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

greyjack/Cargo.toml

@@ -2,6 +2,7 @@
 import numpy as np
 from greyjack.score_calculation.scores.SimpleScore import SimpleScore
 from greyjack.score_calculation.scores.HardSoftScore import HardSoftScore
+from greyjack.score_calculation.scores.HardMediumSoftScore import HardMediumSoftScore
 
 
 class Individual:
@@ -29,6 +30,8 @@ def from_list(list_individual):
             score_type = SimpleScore
         elif score_len == 2:
             score_type = HardSoftScore
+        elif score_len == 3:
+            score_type = HardMediumSoftScore
         else:
             raise ("Can't define score type while inverse converting of list of individuals-lists")
 

greyjack/greyjack/agents/base/Individual.py

@@ -4,7 +4,7 @@
 from greyjack.agents.metaheuristic_bases.Mover import Mover
 from greyjack.agents.base.Individual import Individual
 
-# mostly rewrited by LLM (Rust->Python) for tests purpose only. Will be replaced by normally wrapped Rust version
+
 class TabuSearchBase:
     def __init__(
         self,

greyjack/greyjack/agents/metaheuristic_bases/TabuSearchBase.py

@@ -1,33 +1,17 @@
 
-from typing import Dict, List, Tuple, Any
 import polars as pl
-import numpy as np
-from collections import defaultdict
-from greyjack.score_calculation.score_requesters.VariablesManager import VariablesManager
-from greyjack.greyjack import GJPlanningVariablePy, VariablesManagerPy
+from greyjack.greyjack import VariablesManagerPy, CandidateDfsBuilderPy
 from greyjack.variables import *
 
-# mostly rewrited by LLM from Rust to Python
-
-
-from typing import Dict, List, Tuple, Any
-import polars as pl
-import numpy as np
-from collections import defaultdict
-from greyjack.score_calculation.score_requesters.VariablesManager import VariablesManager
-from greyjack.greyjack import GJPlanningVariablePy, VariablesManagerPy, CandidateDfsBuilderPy
-from greyjack.variables import *
-
-# mostly rewrited by LLM from Rust to Python 
 class OOPScoreRequester:
     def __init__(self, cotwin):
         self.cotwin = cotwin
 
         self.available_planning_variable_types = {GJFloat, GJInteger, GJBinary}
         variables_vec, var_name_to_vec_id_map, vec_id_to_var_name_map = self.build_variables_info(self.cotwin)
         self.variables_manager = VariablesManagerPy(variables_vec)
-        planning_entities_column_map = self.build_column_map(self.cotwin.planning_entities)
-        problem_facts_column_map = self.build_column_map(self.cotwin.problem_facts)
+        planning_entities_column_map, entity_is_int_map = self.build_column_map(self.cotwin.planning_entities)
+        problem_facts_column_map, _ = self.build_column_map(self.cotwin.problem_facts)
         planning_entity_dfs = self.build_group_dfs(self.cotwin.planning_entities, planning_entities_column_map, True)
         problem_fact_dfs = self.build_group_dfs(self.cotwin.problem_facts, problem_facts_column_map, False)
 
@@ -38,10 +22,10 @@ def __init__(self, cotwin):
             planning_entities_column_map,
             problem_facts_column_map,
             planning_entity_dfs,
-            problem_fact_dfs
+            problem_fact_dfs,
+            entity_is_int_map
         )
 
-    # mostly from prototype
     def build_variables_info(self, cotwin):
         variables_vec = []
         var_name_to_vec_id_map = {}
@@ -66,23 +50,25 @@ def build_variables_info(self, cotwin):
 
         return variables_vec, var_name_to_vec_id_map, vec_id_to_var_name_map
 
-    # original from prototype
     def build_column_map(self, entity_groups):
 
-        # Python dict saves order, that's why when I was using HashMap in Rust
-        # there was bug, until I added cotwin object conversion .to_vec()
         column_dict = {}
+        entity_is_int_map = {}
         for group_name in entity_groups:
             column_dict[group_name] = []
             entity_objects = entity_groups[group_name]
             sample_object = entity_objects[0]
             object_attributes = sample_object.__dict__
             for attribute_name in object_attributes:
                 column_dict[group_name].append( attribute_name )
-
-        return column_dict
-
-    # original from prototype
+                attribute_value = object_attributes[attribute_name]
+                if isinstance(attribute_value, GJFloat):
+                    entity_is_int_map[attribute_name] = False
+                else:
+                    entity_is_int_map[attribute_name] = True
+
+        return column_dict, entity_is_int_map
+    
     def build_group_dfs(self, entity_groups, column_dict, is_planning):
 
         df_dict = {}
@@ -92,7 +78,6 @@ def build_group_dfs(self, entity_groups, column_dict, is_planning):
             df_data = []
 
             entity_group = entity_groups[df_name]
-            entities_count = len(entity_group)
             for entity_object in entity_group:
                 row_data = []
                 object_attributes = entity_object.__dict__

greyjack/greyjack/score_calculation/score_requesters/OOPScoreRequester.py

@@ -7,7 +7,7 @@ features = ["pyo3/extension-module"]
 
 [project]
 name = "greyjack"
-version = "0.0.12"
+version = "0.0.13"
 requires-python = ">=3.9"
 dependencies = [
   "numpy",

greyjack/pyproject.toml

@@ -31,6 +31,7 @@ pub struct CandidateDfsBuilder {
         pub planning_entity_dfs: HashMap<String, DataFrame>,
         pub problem_fact_dfs: HashMap<String, DataFrame>,
         pub raw_dfs: HashMap<String, DataFrame>,
+        pub entity_is_int_map: HashMap<String, bool>,
 }
 
 impl CandidateDfsBuilder {
@@ -43,6 +44,7 @@ impl CandidateDfsBuilder {
             problem_facts_column_map: HashMap<String, Vec<String>>,
             planning_entity_dfs: HashMap<String, DataFrame>,
             problem_fact_dfs: HashMap<String, DataFrame>,
+            entity_is_int_map: HashMap<String, bool>,
         ) -> Self {
 
             let mut score_requester = Self {
@@ -51,6 +53,7 @@ impl CandidateDfsBuilder {
                 planning_entity_dfs: planning_entity_dfs.clone(),
                 problem_fact_dfs: problem_fact_dfs,
                 raw_dfs: planning_entity_dfs.clone(),
+                entity_is_int_map: entity_is_int_map,
 
                 variables_manager: VariablesManager::new(variables_vec),
 
@@ -87,7 +90,16 @@ impl CandidateDfsBuilder {
                 for column_name in group_data_map[df_name].keys() {
                     current_df.drop_in_place(column_name).unwrap();
                     let updated_column_data = &group_data_map[df_name][column_name];
-                    let updated_column = Series::new(column_name.into(), updated_column_data);
+                    let mut updated_column = Series::new(column_name.into(), updated_column_data);
+                    if self.entity_is_int_map.contains_key(column_name) {
+                        if *self.entity_is_int_map.get(column_name).unwrap() {
+                            updated_column = updated_column.cast(&DataType::Int64).unwrap();
+                        }
+                    } else if column_name.eq("sample_id") {
+                        updated_column = updated_column.cast(&DataType::UInt64).unwrap();
+                    }
+
+
                     current_df.with_column(updated_column).unwrap();
                 }
                 current_df.rechunk_mut();

greyjack/src/score_calculation/score_requesters/candidate_dfs_builder.rs

@@ -9,8 +9,6 @@ use crate::score_calculation::score_requesters::VariablesManager;
 use crate::variables::GJPlanningVariablePy;
 use crate::variables::GJPlanningVariable;
 use crate::score_calculation::score_requesters::CandidateDfsBuilder;
-
-use std::ops::AddAssign;
 use std:: collections::HashMap;
 use std::string::String;
 
@@ -32,6 +30,7 @@ impl CandidateDfsBuilderPy {
         problem_facts_column_map: HashMap<String, Vec<String>>,
         planning_entity_dfs_py: HashMap<String, PyDataFrame>,
         problem_fact_dfs_py: HashMap<String, PyDataFrame>,
+        entity_is_int_map: HashMap<String, bool>,
     ) -> Self {
 
         let mut variables_vec: Vec<GJPlanningVariable> = variables_vec_py.iter().map(|var_py| {
@@ -62,6 +61,7 @@ impl CandidateDfsBuilderPy {
             planning_entity_dfs: planning_entity_dfs.clone(),
             problem_fact_dfs: problem_fact_dfs,
             raw_dfs: planning_entity_dfs.clone(),
+            entity_is_int_map: entity_is_int_map,
 
             variables_manager: VariablesManager::new(variables_vec),
 
@@ -84,16 +84,6 @@ impl CandidateDfsBuilderPy {
 
     }
 
-    #[getter]
-    pub fn semantic_groups_map(&self) -> PyResult<HashMap<String, Vec<usize>>> {
-        Ok(self.candidate_dfs_builder.variables_manager.semantic_groups_map.clone())
-    }
-
-    #[getter]
-    pub fn discrete_ids(&self) -> PyResult<Option<Vec<usize>>> {
-        Ok(self.candidate_dfs_builder.variables_manager.discrete_ids.clone())
-    }
-
     pub fn get_plain_candidate_dfs(&mut self, samples: Vec<Vec<f64>>) -> (HashMap<String, PyDataFrame>, HashMap<String, PyDataFrame>) {
 
         let (planning_entity_dfs, problem_fact_dfs) = self.candidate_dfs_builder.get_plain_candidate_dfs(&samples);