X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=contrib%2Fchash%2Fchash.php;h=34a30b5bfb819e02b64403266532e04b19e421a6;hb=f9ce93b166506a19c52f4639f94c1f8f227f7029;hp=7db1f73a85dfd9c0b9e284b38a00d3fc695a3e1c;hpb=4253d604970e9db0d64c2cda0aeec0c6531bbb62;p=core.git

diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index 7db1f73a..34a30b5b 100644
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -4,14 +4,27 @@ error_reporting(E_ALL | E_STRICT);
 define('START_TIME'            , microtime(TRUE));
 define('CHECK_POINT'           , 'chash.pos');
 
+// Hashes needed to complete a "block"
 $GLOBALS['block_size']          = 100;
 $GLOBALS['none_increment']      = (1 / pow(10, 20));
-$GLOBALS['hash_algo']           = MHASH_RIPEMD320;
+
+// Hashing algorythm
+$GLOBALS['hash_algo']           = MHASH_SHA256;
+
+// Automatic saving interval in seconds
 $GLOBALS['flush_file_time']     = 30;
+
+/*
+ * How long (in seconds) to try to find a proper hash until the best root hash
+ * is taken.
+ */
 $GLOBALS['restart_search_time'] = 1800;
 
 // Hashes per call
-$GLOBALS['hash_cycles'] = 3;
+$GLOBALS['hash_cycles'] = 5;
+
+// Total restarts
+$GLOBALS['total_restarts'] = 0;
 
 // Found hashes
 $GLOBALS['found_hashes'] = array(0 => array());
@@ -70,6 +83,9 @@ function modulaHash ($hash1, $hash2) {
 	// Both must have same length
 	assert(strlen($hash1) === strlen($hash2));
 
+	// Init propability array with 256 zeros
+	$propability = array_fill(0, 256, 0);
+
 	// Init new hash
 	$modulaHash = '';
 
@@ -82,6 +98,9 @@ function modulaHash ($hash1, $hash2) {
 		$part1 = hexdec(substr($hash1, $idx, 2));
 		$part2 = hexdec(substr($hash2, $idx, 2));
 
+		// Debug message
+		//* NOISY-DEBUG: */ print 'part1=' . $part1 . ',part2=' . $part2 . PHP_EOL;
+
 		/*
 		 * If part1 is larget part2, part1 is divident and vise-versa. But don't do it
 		 * if one is zero
@@ -89,18 +108,43 @@ function modulaHash ($hash1, $hash2) {
 		if (($part1 > $part2) && ($part2 > 0)) {
 			// 'part1' is larger than 'part2'
 			$mod = $part1 % $part2;
-		} elseif (($part1 < $part2) && ($part1 > 0)) {
+		} elseif (($part2 > $part1) && ($part1 > 0)) {
 			// 'part2' is larger than 'part1'
 			$mod = $part2 % $part1;
 		}
 
-		// "Invert" the result against 255
+		// $mod is now mostly a small number so try to "improve" it
+		//* NOISY-DEBUG: */ print 'mod[' . gettype($mod) . ']=' . $mod . ' - BEFORE!' . PHP_EOL;
+		$mod = (int) round(sqrt($mod * ($part1 + $part2 + $mod ^ 7) / 3));
+		//* NOISY-DEBUG: */ print 'mod[' . gettype($mod) . ']=' . $mod . ' - AFTER!' . PHP_EOL;
+
+		// Make sure it is valid
+		assert($mod >= 0);
+		assert($mod <= 255);
+
+		// "Invert" the result against 255 as zeros are not good for later calculations
 		$mod = 255 - $mod;
 
+		// Add it to propability array for debugging
+		$propability[$mod]++;
+
 		// Encode to hex, pre-pad it with zeros and add to new hash
 		$modulaHash .= padHex($mod);
 	} // END - for
 
+	// Debug propability array
+	$cnt = 0;
+	foreach ($propability as $value) {
+		// Is the value larger than one, means the number has been found at least once?
+		if ($value > 0) {
+			// Then count it
+			$cnt++;
+		} // END - if
+	} // END - foreach
+
+	// Debug message
+	//* NOISY-DEBUG: */ print('cnt=' . $cnt . '/' . strlen($hash1) / 2 . PHP_EOL);
+
 	// Modula hash must have same length as input hash
 	assert(strlen($modulaHash) === strlen($hash1));
 
@@ -213,11 +257,12 @@ function flushCheckPointFile ($hash) {
 		$GLOBALS['total_reward'] . ':' .
 		$GLOBALS['total_hashes'] . ':' .
 		$GLOBALS['total_found'] . ':' .
+		$GLOBALS['total_restarts'] . ':' .
 		$GLOBALS['hash_cycles'] . ':' .
-		base64_encode($GLOBALS['nonce']) . ':' .
+		base64_encode((float) $GLOBALS['nonce']) . ':' .
 		$hash . ':' .
 		$GLOBALS['root_hash'] . ':' .
-		base64_encode(gzcompress(serialize($GLOBALS['found_hashes'])))
+		base64_encode(gzcompress(json_encode($GLOBALS['found_hashes'])))
 	);
 
 	// Set time
@@ -239,7 +284,7 @@ function addFoundHash ($hash) {
 		'modula_hash'  => $GLOBALS['modula_hash'],
 		'genesis_hash' => $GLOBALS['genesis_hash'],
 		'root_hash'    => $GLOBALS['root_hash'],
-		'nonce'        => $GLOBALS['nonce'],
+		'nonce'        => (float) $GLOBALS['nonce'],
 		'iter'         => $GLOBALS['iteration'],
 		'hashes_block' => $GLOBALS['hashes_block'],
 		'hash_cycles'  => $GLOBALS['hash_cycles'],
@@ -351,20 +396,21 @@ if (is_readable(CHECK_POINT)) {
 	$data = explode(':', $checkPoint);
 
 	// Assert on count
-	assert(count($data) == 9);
+	assert(count($data) == 10);
 
 	// 1st element is nonce, 2nd hash, 3rd found hashes
-	$GLOBALS['total_blocks'] = $data[0];
-	$GLOBALS['total_reward'] = $data[1];
-	$GLOBALS['total_hashes'] = $data[2];
-	$GLOBALS['total_found']  = $data[3];
-	$GLOBALS['hash_cycles']  = intval($data[4]);
-	$GLOBALS['nonce']        = base64_decode($data[5]);
-	$GLOBALS['root_hash']    = $data[7];
-	$GLOBALS['found_hashes'] = unserialize(gzuncompress(base64_decode($data[8])));
+	$GLOBALS['total_blocks']   = $data[0];
+	$GLOBALS['total_reward']   = $data[1];
+	$GLOBALS['total_hashes']   = $data[2];
+	$GLOBALS['total_found']    = $data[3];
+	$GLOBALS['total_restarts'] = $data[4];
+	$GLOBALS['hash_cycles']    = intval($data[5]);
+	$GLOBALS['nonce']          = (float) base64_decode($data[6]);
+	$GLOBALS['root_hash']      = $data[8];
+	$GLOBALS['found_hashes']   = json_decode(gzuncompress(base64_decode($data[9])));
 
 	// Set modula hash
-	setModulaHash($data[6]);
+	setModulaHash($data[7]);
 } else {
 	// Create nonce (small)
 	initNonce();
@@ -442,6 +488,12 @@ while (TRUE) {
 
 			// Is the last found time to far away?
 			if ($testTime >= $GLOBALS['restart_search_time']) {
+				// Count up restart
+				$GLOBALS['total_restarts']++;
+
+				// Output message
+				print('total_restarts=' . $GLOBALS['total_restarts'] . ' - Restarting ...');
+
 				// Count all root (genesis) hashes
 				$rootHashes = array();
 				foreach ($GLOBALS['found_hashes'] as $block) {