Optimization/weights

SynchronizedPDS/src/main/java/sync/pds/weights/SetDomainImpl.java

@@ -35,30 +35,26 @@ public SetDomainImpl(Collection<Node<Stmt, Fact>> nodes) {
 
   @NonNull
   @Override
-  public Weight extendWith(Weight other) {
-    if (other.equals(one())) {
+  public Weight extendWith(@NonNull Weight other) {
+    Weight one = one();
+    if (other == one) {
       return this;
     }
-    if (this.equals(one())) {
-      return other;
-    }
+
     return zero();
   }
 
   @NonNull
   @Override
   public Weight combineWith(@NonNull Weight other) {
 
-    if (other.equals(zero())) return this;
-    if (this.equals(zero())) return other;
-    if (this.equals(one()) || other.equals(one())) return one();
-
-    if (other instanceof SetDomainImpl) {
-      Set<Node<Stmt, Fact>> merged = Sets.newHashSet(nodes);
-      merged.addAll(((SetDomainImpl) other).nodes);
-      return new SetDomainImpl<N, Stmt, Fact>(merged);
-    }
-    return zero();
+    SetDomainZero zero = zero();
+    SetDomain one = one();
+    if (other == zero) return this;
+    if (other == one) return one;
+    Set<Node<Stmt, Fact>> merged = Sets.newHashSet(nodes);
+    merged.addAll(((SetDomainImpl) other).nodes);
+    return new SetDomainImpl<N, Stmt, Fact>(merged);
   }
 
   @NonNull

SynchronizedPDS/src/main/java/sync/pds/weights/SetDomainOne.java

@@ -14,8 +14,6 @@
  */
 package sync.pds.weights;
 
-import static sync.pds.weights.SetDomainZero.zero;
-
 import java.util.Collection;
 import org.jspecify.annotations.NonNull;
 import sync.pds.solver.nodes.Node;
@@ -24,39 +22,24 @@
 public class SetDomainOne implements SetDomain {
   @NonNull private static final SetDomainOne one = new SetDomainOne();
 
-  private SetDomainOne() {}
+  private SetDomainOne() {
+    /* Singleton*/
+  }
 
-  public static Weight one() {
+  public static SetDomainOne one() {
     return one;
   }
 
   @NonNull
   @Override
   public Weight extendWith(@NonNull Weight other) {
-    if (other.equals(one())) {
-      return this;
-    }
-    if (this.equals(one())) {
-      return other;
-    }
-    return zero();
+    return other;
   }
 
   @NonNull
   @Override
   public Weight combineWith(@NonNull Weight other) {
-
-    if (other.equals(zero())) return this;
-    if (this.equals(zero())) return other;
-    if (this.equals(one()) || other.equals(one())) return one();
-
-    if (other instanceof SetDomainOne) {
-      throw new IllegalStateException("SetDomainOne.CombineWith-Dont");
-      //      Set<Node<Stmt, Fact>> merged = Sets.newHashSet(getNodes());
-      //      merged.addAll(((SetDomainImpl) other).getNodes());
-      //      return new SetDomainImpl<N, Stmt, Fact>(merged);
-    }
-    return zero();
+    return this;
   }
 
   @NonNull

SynchronizedPDS/src/main/java/sync/pds/weights/SetDomainZero.java

@@ -14,11 +14,7 @@
  */
 package sync.pds.weights;
 
-import static sync.pds.weights.SetDomainOne.one;
-
-import com.google.common.collect.Sets;
 import java.util.Collection;
-import java.util.HashSet;
 import org.jspecify.annotations.NonNull;
 import sync.pds.solver.nodes.Node;
 import wpds.impl.Weight;
@@ -27,35 +23,24 @@ public class SetDomainZero implements SetDomain {
 
   @NonNull private static final SetDomainZero zero = new SetDomainZero();
 
-  private SetDomainZero() {}
+  private SetDomainZero() {
+    /* Singleton */
+  }
+
+  public static SetDomainZero zero() {
+    return zero;
+  }
 
   @NonNull
   @Override
   public Weight extendWith(@NonNull Weight other) {
-    if (other.equals(one())) {
-      return this;
-    }
-    if (this.equals(one())) {
-      return other;
-    }
-    return zero();
+    return this;
   }
 
   @NonNull
   @Override
   public Weight combineWith(@NonNull Weight other) {
-
-    if (other.equals(zero())) return this;
-    if (this.equals(zero())) return other;
-    if (this.equals(one()) || other.equals(one())) return one();
-
-    if (other instanceof SetDomainOne) {
-      HashSet<Node> merged = Sets.newHashSet(getNodes());
-      merged.addAll(((SetDomainImpl) other).getNodes());
-      throw new IllegalStateException("SetDomainZero.CombineWith-Dont");
-      //      return new SetDomainImpl<N, Stmt, Fact>(merged);
-    }
-    return zero();
+    return other;
   }
 
   @NonNull
@@ -64,10 +49,6 @@ public Collection<Node> getNodes() {
     throw new IllegalStateException("SetDomain.getNodes() - don't");
   }
 
-  public static SetDomainZero zero() {
-    return zero;
-  }
-
   @NonNull
   @Override
   public Collection<Node> elements() {

WPDS/pom.xml

@@ -28,6 +28,7 @@
         <dependency>
             <groupId>de.fraunhofer.iem</groupId>
             <artifactId>PDS</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.fraunhofer.iem</groupId>
@@ -37,5 +38,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 </project>

WPDS/src/test/java/tests/MinSeminringPostStarTests.java

@@ -104,7 +104,7 @@ public void twoCall() {
   }
 
   private static MinSemiring w(int i) {
-    return new MinSemiring(i);
+    return new MinSemiringImpl(i);
   }
 
   static WeightedPAutomaton<StackSymbol, Abstraction, MinSemiring> waccepts(
@@ -124,7 +124,7 @@ public StackSymbol epsilon() {
 
           @Override
           public MinSemiring getOne() {
-            return MinSemiring.one();
+            return MinSemiringOne.one();
           }
 
           @Override

WPDS/src/test/java/tests/MinSemiring.java

@@ -14,84 +14,8 @@
  */
 package tests;
 
-import de.fraunhofer.iem.Location;
-import org.jspecify.annotations.NonNull;
 import wpds.impl.Weight;
 
-public class MinSemiring implements Weight {
-  int i;
-
-  public MinSemiring(int i) {
-    this.i = i;
-  }
-
-  private MinSemiring() {}
-
-  @NonNull
-  @Override
-  public Weight extendWith(@NonNull Weight other) {
-    if (other.equals(one())) return this;
-    if (this.equals(one())) return other;
-    MinSemiring o = (MinSemiring) other;
-    return new MinSemiring(o.i + i);
-  }
-
-  @NonNull
-  @Override
-  public Weight combineWith(@NonNull Weight other) {
-    if (other.equals(zero())) return this;
-    if (this.equals(zero())) return other;
-    MinSemiring o = (MinSemiring) other;
-    return new MinSemiring(Math.min(o.i, i));
-  }
-
-  private static MinSemiring one;
-
-  public static <N extends Location> MinSemiring one() {
-    if (one == null)
-      one =
-          new MinSemiring(0) {
-            @Override
-            public String toString() {
-              return "<ONE>";
-            }
-          };
-    return one;
-  }
-
-  private static MinSemiring zero;
-
-  public static <N extends Location> MinSemiring zero() {
-    if (zero == null)
-      zero =
-          new MinSemiring(110000) {
-            @Override
-            public String toString() {
-              return "<ZERO>";
-            }
-          };
-    return zero;
-  }
-
-  @Override
-  public String toString() {
-    return Integer.toString(i);
-  }
-
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + i;
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) return true;
-    if (obj == null) return false;
-    if (getClass() != obj.getClass()) return false;
-    MinSemiring other = (MinSemiring) obj;
-    return i == other.i;
-  }
+public interface MinSemiring extends Weight {
+  int getValue();
 }

WPDS/src/test/java/tests/MinSemiringImpl.java

@@ -0,0 +1,76 @@
+/**
+ * ***************************************************************************** 
+ * Copyright (c) 2018 Fraunhofer IEM, Paderborn, Germany
+ * <p>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * <p>
+ * SPDX-License-Identifier: EPL-2.0
+ * <p>
+ * Contributors:
+ *   Johannes Spaeth - initial API and implementation
+ * *****************************************************************************
+ */
+package tests;
+
+import static tests.MinSemiringOne.one;
+import static tests.MinSemiringZero.zero;
+
+import org.jspecify.annotations.NonNull;
+import wpds.impl.Weight;
+
+public class MinSemiringImpl implements MinSemiring {
+
+  protected final int value;
+
+  public MinSemiringImpl(int value) {
+    this.value = value;
+  }
+
+  public int getValue() {
+    return value;
+  }
+
+  @NonNull
+  @Override
+  public Weight extendWith(@NonNull Weight other) {
+    if (other == one()) {
+      return this;
+    }
+    MinSemiringImpl o = (MinSemiringImpl) other;
+    return new MinSemiringImpl(o.value + value);
+  }
+
+  @NonNull
+  @Override
+  public Weight combineWith(@NonNull Weight other) {
+    if (other == zero()) {
+      return this;
+    }
+    MinSemiringImpl o = (MinSemiringImpl) other;
+    return new MinSemiringImpl(Math.min(o.value, value));
+  }
+
+  @Override
+  public String toString() {
+    return Integer.toString(value);
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + value;
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) return true;
+    if (obj == null) return false;
+    if (getClass() != obj.getClass()) return false;
+    MinSemiringImpl other = (MinSemiringImpl) obj;
+    return value == other.value;
+  }
+}