-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert analysis to TypeScript, see #749
- Loading branch information
Showing
11 changed files
with
130 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import DynamicCircuitResistiveBattery from './DynamicCircuitResistiveBattery.js'; | ||
import Circuit from './Circuit.js'; | ||
import Battery from './Battery.js'; | ||
import CircuitResult from './CircuitResult.js'; | ||
|
||
class ResistiveBatteryAdapter extends DynamicCircuitResistiveBattery { | ||
battery: Battery; | ||
|
||
/** | ||
* @param {Circuit} circuit - the primary Circuit model instance, so we can look up Vertex indices | ||
* @param {Battery} battery | ||
*/ | ||
constructor( circuit: Circuit, battery: Battery ) { | ||
super( | ||
battery.startVertexProperty.value.index, | ||
battery.endVertexProperty.value.index, | ||
battery.voltageProperty.value, | ||
battery.internalResistanceProperty.value | ||
); | ||
|
||
// @public (read-only) | ||
this.battery = battery; | ||
} | ||
|
||
/** | ||
* @param {CircuitResult} circuitResult | ||
* @public | ||
*/ | ||
applySolution( circuitResult: CircuitResult ) { | ||
this.battery.currentProperty.value = circuitResult.getTimeAverageCurrent( this ); | ||
} | ||
} | ||
|
||
export default ResistiveBatteryAdapter; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import ModifiedNodalAnalysisCircuitElement from './ModifiedNodalAnalysisCircuitElement.js'; | ||
import CCKCConstants from '../CCKCConstants.js'; | ||
import Circuit from './Circuit.js'; | ||
import Resistor from './Resistor.js'; | ||
import CircuitResult from './CircuitResult.js'; | ||
|
||
class ResistorAdapter extends ModifiedNodalAnalysisCircuitElement { | ||
resistor: Resistor; | ||
|
||
/** | ||
* @param {Circuit} circuit | ||
* @param {Resistor} resistor | ||
*/ | ||
constructor( circuit: Circuit, resistor: Resistor ) { | ||
super( | ||
resistor.startVertexProperty.value.index, | ||
resistor.endVertexProperty.value.index, | ||
resistor, | ||
|
||
// If a resistor goes to 0 resistance, then we cannot compute the current through as I=V/R. Therefore, | ||
// simulate a small amount of resistance. | ||
resistor.resistanceProperty.value || CCKCConstants.MINIMUM_RESISTANCE | ||
); | ||
|
||
// @private | ||
this.resistor = resistor; | ||
} | ||
|
||
/** | ||
* @param {CircuitResult} circuitResult | ||
* @public | ||
*/ | ||
applySolution( circuitResult: CircuitResult ) { | ||
this.resistor.currentProperty.value = circuitResult.getTimeAverageCurrent( this ); | ||
} | ||
} | ||
|
||
export default ResistorAdapter; |
Oops, something went wrong.