fix: renamed Algebraic => Numeric
This is not doing algebraic manipulations, this is doing numeric computations. Confusing difference.
This commit is contained in:
		
							parent
							
								
									8deb796820
								
							
						
					
					
						commit
						8b042db2b8
					
				| 
						 | 
					@ -262,7 +262,7 @@ let combineAlgebraicallyWithDiscreteSecond = (
 | 
				
			||||||
    | #Stepwise => stepwiseToLinear(t1)
 | 
					    | #Stepwise => stepwiseToLinear(t1)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let combinedShape = AlgebraicShapeCombination.combineShapesContinuousDiscrete(
 | 
					    let combinedShape = NumericShapeCombination.combineShapesContinuousDiscrete(
 | 
				
			||||||
      op,
 | 
					      op,
 | 
				
			||||||
      continuousAsLinear |> getShape,
 | 
					      continuousAsLinear |> getShape,
 | 
				
			||||||
      t2s,
 | 
					      t2s,
 | 
				
			||||||
| 
						 | 
					@ -296,7 +296,7 @@ let combineAlgebraicallyWithDiscreteFirst = (
 | 
				
			||||||
    | #Stepwise => stepwiseToLinear(t2)
 | 
					    | #Stepwise => stepwiseToLinear(t2)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let combinedShape = AlgebraicShapeCombination.combineShapesDiscreteContinuous(
 | 
					    let combinedShape = NumericShapeCombination.combineShapesDiscreteContinuous(
 | 
				
			||||||
      op,
 | 
					      op,
 | 
				
			||||||
      t1s,
 | 
					      t1s,
 | 
				
			||||||
      continuousAsLinear |> getShape,
 | 
					      continuousAsLinear |> getShape,
 | 
				
			||||||
| 
						 | 
					@ -322,7 +322,7 @@ let combineAlgebraically = (op: Operation.algebraicOperation, t1: t, t2: t) => {
 | 
				
			||||||
  if t1n == 0 || t2n == 0 {
 | 
					  if t1n == 0 || t2n == 0 {
 | 
				
			||||||
    empty
 | 
					    empty
 | 
				
			||||||
  } else {
 | 
					  } else {
 | 
				
			||||||
    let combinedShape = AlgebraicShapeCombination.combineShapesContinuousContinuous(op, s1, s2)
 | 
					    let combinedShape = NumericShapeCombination.combineShapesContinuousContinuous(op, s1, s2)
 | 
				
			||||||
    let combinedIntegralSum = Common.combineIntegralSums(
 | 
					    let combinedIntegralSum = Common.combineIntegralSums(
 | 
				
			||||||
      (a, b) => Some(a *. b),
 | 
					      (a, b) => Some(a *. b),
 | 
				
			||||||
      t1.integralSumCache,
 | 
					      t1.integralSumCache,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user