Commits

Shlomi Fish committed df216f6

More refactoring

git-svn-id: file:///home/shlomif/Backup/svn-dumps/google-code/svnsync-repos/fc-solve/trunk@1960 e7e8a897-7ba4-4ee7-b36f-f4c66519b19a

Comments (0)

Files changed (2)

fc-solve/source/scans.c

 #define FCS_A_STAR_CARDS_UNDER_SEQUENCES_EXPONENT 1.3
 #define FCS_A_STAR_SEQS_OVER_RENEGADE_CARDS_EXPONENT 1.3
 
+#define FCS_SEQS_OVER_RENEGADE_POWER(n) pow(n, FCS_A_STAR_SEQS_OVER_RENEGADE_CARDS_EXPONENT)
+
 static GCC_INLINE int update_col_cards_under_sequences(
         fc_solve_soft_thread_t * soft_thread,
         fcs_cards_column_t col,
             seqs_over_renegade_cards +=
                 ((unlimited_sequence_move) ?
                     1 :
-                    pow(cards_num-c-1, FCS_A_STAR_SEQS_OVER_RENEGADE_CARDS_EXPONENT)
+                    FCS_SEQS_OVER_RENEGADE_POWER(cards_num-c-1)
                     );
         }
     }
             / soft_thread->a_star_initial_cards_under_sequences) * a_star_weights[FCS_A_STAR_WEIGHT_CARDS_UNDER_SEQUENCES];
 
     ret += (seqs_over_renegade_cards /
-               pow(LOCAL_DECKS_NUM*52, FCS_A_STAR_SEQS_OVER_RENEGADE_CARDS_EXPONENT) )
+               FCS_SEQS_OVER_RENEGADE_POWER(LOCAL_DECKS_NUM*(13*4))
+            )
            * a_star_weights[FCS_A_STAR_WEIGHT_SEQS_OVER_RENEGADE_CARDS];
 
     num_cards_in_founds = 0;

fc-solve/source/scripts/ids-whitelist.txt

 synergy
 after_ws
 DERIVED_STATES_LIST_GROW_BY
+FCS_A_STAR_CARDS_UNDER_SEQUENCES_EXPONENT
+cards_under_sequences_ptr