Merge pull request #383 from rheiland/cell-division-axis

add cell_division_direction_function for divide()

Author: MathCancer

core/PhysiCell_cell.cpp

@@ -608,10 +608,22 @@ Cell* Cell::divide( )
 	normalize( &rand_vec ); 
 	rand_vec *= radius; // multiply direction times the displacement 
 	*/
-	
-	std::vector<double> rand_vec = cell_division_orientation(); 
-	rand_vec = rand_vec- phenotype.geometry.polarity*(rand_vec[0]*state.orientation[0]+ 
-		rand_vec[1]*state.orientation[1]+rand_vec[2]*state.orientation[2])*state.orientation;	
+
+	std::vector<double> rand_vec; 
+	if( this->functions.cell_division_direction_function )
+	{ 
+		rand_vec = this->functions.cell_division_direction_function( this ); 
+        if( default_microenvironment_options.simulate_2D == true )  // ensure vec in XY plane
+	        { rand_vec[2] = 0.0; }
+        normalize( &rand_vec );  // ensure normalized
+	}
+	else
+	{
+		rand_vec = cell_division_orientation(); 
+		rand_vec = rand_vec- phenotype.geometry.polarity*(rand_vec[0]*state.orientation[0]+ 
+			rand_vec[1]*state.orientation[1]+rand_vec[2]*state.orientation[2])*state.orientation;	
+	}
+
 	rand_vec *= phenotype.geometry.radius;
 
 	child->assign_position(position[0] + rand_vec[0],
@@ -1362,6 +1374,7 @@ void Cell::ingest_cell( Cell* pCell_to_eat )
 		pCell_to_eat->functions.update_phenotype = NULL; 
 		pCell_to_eat->functions.contact_function = NULL; 
 		pCell_to_eat->functions.cell_division_function = NULL; 
+		pCell_to_eat->functions.cell_division_direction_function = NULL; 
 
 		// should set volume fuction to NULL too! 
 		pCell_to_eat->functions.volume_update_function = NULL; 
@@ -1613,6 +1626,7 @@ void Cell::fuse_cell( Cell* pCell_to_fuse )
 		pCell_to_fuse->functions.update_phenotype = NULL; 
 		pCell_to_fuse->functions.contact_function = NULL; 
 		pCell_to_fuse->functions.cell_division_function = NULL; 
+		pCell_to_fuse->functions.cell_division_direction_function = NULL; 
 		pCell_to_fuse->functions.volume_update_function = NULL; 
 
 		// remove all adhesions 
@@ -1653,6 +1667,7 @@ void Cell::lyse_cell( void )
 	functions.update_phenotype = NULL; 
 	functions.contact_function = NULL; 
 	functions.cell_division_function = NULL; 
+	functions.cell_division_direction_function = NULL; 
 
 	// remove all adhesions 
 
@@ -1750,6 +1765,13 @@ void display_ptr_as_bool( void (*ptr)(Cell*,Cell*), std::ostream& os )
 	os << "false"; 
 	return;
 }
+void display_ptr_as_bool( std::vector<double> (*ptr)(Cell*), std::ostream& os )
+{
+	if( ptr )
+	{ os << "true"; return; }
+	os << "false"; 
+	return;
+}
 
 void display_cell_definitions( std::ostream& os )
 {
@@ -1836,6 +1858,8 @@ void display_cell_definitions( std::ostream& os )
 		os << std::endl; 
 		os << "\t\t cell division function: "; display_ptr_as_bool( pCF->cell_division_function , std::cout ); 
 		os << std::endl; 
+		os << "\t\t cell division direction function: "; display_ptr_as_bool( pCF->cell_division_direction_function , std::cout ); 
+		os << std::endl; 
 
 		// summarize motility 
 

core/PhysiCell_phenotype.h

@@ -517,6 +517,7 @@ class Cell_Functions
 		Cell* pOther, Phenotype& other_phenotype, double dt ); 
 
     void (*cell_division_function)(Cell* pCell1, Cell* pCell2 );
+    std::vector<double> (*cell_division_direction_function)(Cell* pCell1);
 
 	/* prototyping / beta in 1.5.0 */ 
 /*