все находится почти правильно, но знак неверный. когда меняю на нужны…

…й все становится true. смотрим solve и insert
th13f · May 13, 2014 · b6bd4b5 · b6bd4b5
1 parent f85bfef
commit b6bd4b5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/main/java/by/bsu/coursework/Logger.java b/src/main/java/by/bsu/coursework/Logger.java
@@ -10,6 +10,6 @@
  */
 public class Logger {
     public static void info(String info){
-        //System.out.println(info);
+        System.out.println(info);
     }
 }
diff --git a/src/main/java/by/bsu/coursework/structures/Equation.java b/src/main/java/by/bsu/coursework/structures/Equation.java
@@ -19,6 +19,11 @@ public Equation() {
         rightPart=new LinkedList<>();
     }
 
+    public Equation(LinkedList<EquationPart> leftPart, LinkedList<EquationPart> rightPart) {
+        this.leftPart=new LinkedList<>(leftPart);
+        this.rightPart=new LinkedList<>(rightPart);
+    }
+
     public void addToLeft(EquationPart var){
         leftPart.add(var);
     }
@@ -148,4 +153,8 @@ public void insert(Commutation what){
                 i++;
         }
     }
+
+    Equation copy() {
+        return new Equation(this.leftPart,this.rightPart);
+    }
 }
diff --git a/src/main/java/by/bsu/coursework/structures/Structure.java b/src/main/java/by/bsu/coursework/structures/Structure.java
@@ -75,19 +75,19 @@ public void calculate() {
             roots.add(root);
             systems.add(Worker.getSystem(flow, vertices, flowIndex, alphas.get(flowIndex)));
             cyclicEdges.add(cyclicEdge);
+
             calculateCharacteristicVectors(
                     flowIndex, 
-                    flows, 
                     characteristicVectors, 
                     cyclicEdge, 
                     spanningTree, 
                     systems, 
                     gettArrayInversed(flowIndex),
                     getpArray(flowIndex),
                     getdArray(flowIndex));
+
             calculateParticleSolve(
                     flowIndex, 
-                    flows, 
                     characteristicVectors, 
                     cyclicEdge, 
                     spanningTree, 
@@ -102,15 +102,13 @@ public void calculate() {
 
     static void calculateCharacteristicVectors(
             int flowIndex, 
-            ArrayList<LinkedList<Edge>> flows, 
             LinkedList<CharacteristicVector> vectors, 
             LinkedList<Edge> cyclicEdges, 
             LinkedList<Edge> spanningTree, 
             ArrayList<ArrayList<Equation>> systems,
             List<Integer> t,
             Integer[] p,
             Integer[] d){
-        LinkedList<Edge> flow = flows.get(flowIndex);
 
         for (int i=0; i<cyclicEdges.size(); i++){
             Edge edge = cyclicEdges.get(i);
@@ -120,9 +118,12 @@ static void calculateCharacteristicVectors(
             mainEdge.addTo(new Constant(1));
             vector.addCommutation(mainEdge);
 
-            ArrayList<Equation> system = (ArrayList)systems.get(flowIndex).clone();
-            for (Equation e:system)
-                e.zeroRight();
+            ArrayList<Equation> system = new ArrayList<>();
+            for (Equation e:systems.get(flowIndex)){
+                Equation eq = e.copy();
+                eq.zeroRight();
+                system.add(eq);
+            }
 
             for (Edge e:cyclicEdges){
                 if (!e.equals(edge)){
@@ -157,20 +158,21 @@ static void calculateCharacteristicVectors(
 
     static void calculateParticleSolve(
             int flowIndex, 
-            ArrayList<LinkedList<Edge>> flows, 
             LinkedList<CharacteristicVector> vectors, 
             LinkedList<Edge> cyclicEdges, 
             LinkedList<Edge> spanningTree, 
             ArrayList<ArrayList<Equation>> systems,
             List<Integer> t,
             Integer[] p,
             Integer[] d){
-        LinkedList<Edge> flow = flows.get(flowIndex);
 
         Edge edge = new Edge(0,0);
         CharacteristicVector vector = new CharacteristicVector(flowIndex,edge.toString());
 
-        ArrayList<Equation> system = (ArrayList)systems.get(flowIndex).clone();
+        ArrayList<Equation> system = new ArrayList<>();
+            for (Equation e:systems.get(flowIndex)){
+                system.add(e.copy());
+            }
 
         for (Edge e:cyclicEdges){
             Commutation tmp = new Commutation(new Variable("x",e.toString(),""+flowIndex,1));