Merge remote-tracking branch 'origin/BranchOne_SuperPolicy' into Bran…

…chOne_SuperPolicy

simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/AccessEvent.java

@@ -29,7 +29,7 @@
  */
 @Immutable
 public class AccessEvent {
-  private final long key;
+  public final long key;
 
   public AccessEvent(long key) {
     this.key = key;

simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/Policy.java

@@ -15,6 +15,9 @@
  */
 package com.github.benmanes.caffeine.cache.simulator.policy;
 
+import com.github.benmanes.caffeine.cache.simulator.policy.two_queue.TwoQueuePolicy;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+
 import static com.google.common.base.Preconditions.checkState;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -32,14 +35,13 @@ public interface Policy {
 
   /** Records that the entry was accessed. */
   void record(AccessEvent event);
-  void evict(AccessEvent event);
 
   /** Indicates that the recording has completed. */
   default void finished() {}
 
   /** Returns the cache efficiency statistics. */
   PolicyStats stats();
-
+  Long2ObjectMap<Object> data();
   /** The policy's name. */
   default String name() {
     PolicySpec policySpec = getClass().getAnnotation(PolicySpec.class);
@@ -68,15 +70,12 @@ enum Characteristic {
     Characteristic[] characteristics() default {};
   }
 
+
   /** A policy that does not exploit external event metadata. */
   interface KeyOnlyPolicy extends Policy {
     @Override default void record(AccessEvent event) {
       record(event.key());
     }
-    @Override default void evict(AccessEvent event){
-      evict(event.key());
-    }
     void record(long key);
-    void evict(long key);
   }
 }

simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/esp/PipelinePolicy.java

@@ -107,11 +107,11 @@ public void record(long key) {
       int blockIndex = lookUptable.get(key);
       if (pipelinePolicies.get(blockIndex) instanceof KeyOnlyPolicy) {
         // Handle the event as a key-only event
-        ((KeyOnlyPolicy) pipelinePolicies.get(blockIndex)).evict(key);
+        ((KeyOnlyPolicy) pipelinePolicies.get(blockIndex)).data.remove(key);
       } else {
         // Handle the event for a generic policy
         AccessEvent event = new AccessEvent(key/* Additional details here */);
-        pipelinePolicies.get(blockIndex).evict(event);
+        pipelinePolicies.get(blockIndex).data.remove(event.key);
       }
 
       //PROPAGATION
@@ -160,12 +160,6 @@ public void record(long key) {
 
     }
 
-  @Override
-  public void evict(long key) {
-
-  }
-
-
   @Override
   public PolicyStats stats() {
     // You can also access and use the statistics from the TwoQueuePolicy instance

simulator/src/main/java/com/github/benmanes/caffeine/cache/simulator/policy/sampled/SampledPolicy.java

@@ -78,6 +78,7 @@ public SampledPolicy(Admission admission, EvictionPolicy policy, Config config)
     this.maximumSize = Math.toIntExact(settings.PPmaximumSize()); //need to change
     this.sampleStrategy = settings.sampleStrategy();
     this.random = new Random(settings.randomSeed());
+
     this.data = new Long2ObjectOpenHashMap<>();
     this.sampleSize = settings.sampleSize();
     this.table = new Node[maximumSize + 1];