diff --git a/src/analysis/timeline/params.js b/src/analysis/timeline/params.js index a3f2819..aa845e4 100644 --- a/src/analysis/timeline/params.js +++ b/src/analysis/timeline/params.js @@ -6,7 +6,7 @@ import { toJSON as weightsToJSON, fromJSON as weightsFromJSON, defaultWeights, -} from "../weights"; +} from "../../core/weights"; /** * Parameters for computing TimelineCred diff --git a/src/analysis/timeline/params.test.js b/src/analysis/timeline/params.test.js index ddf3745..823f8e1 100644 --- a/src/analysis/timeline/params.test.js +++ b/src/analysis/timeline/params.test.js @@ -9,7 +9,7 @@ import { DEFAULT_ALPHA, DEFAULT_INTERVAL_DECAY, } from "./params"; -import {defaultWeights} from "../weights"; +import {defaultWeights} from "../../core/weights"; import {NodeAddress} from "../../core/graph"; describe("analysis/timeline/params", () => { diff --git a/src/analysis/timeline/timelinePagerank.js b/src/analysis/timeline/timelinePagerank.js index 754bc55..ba3f00f 100644 --- a/src/analysis/timeline/timelinePagerank.js +++ b/src/analysis/timeline/timelinePagerank.js @@ -8,7 +8,7 @@ import {sum} from "d3-array"; import * as NullUtil from "../../util/null"; import {Graph, type NodeAddressT, type Edge, type Node} from "../../core/graph"; import {type NodeAndEdgeTypes} from "../types"; -import {type Weights} from "../weights"; +import {type Weights} from "../../core/weights"; import {type Interval, partitionGraph} from "./interval"; import { nodeWeightEvaluator, diff --git a/src/analysis/types.js b/src/analysis/types.js index a6ced9c..44de457 100644 --- a/src/analysis/types.js +++ b/src/analysis/types.js @@ -1,7 +1,7 @@ // @flow import {type NodeAddressT, type EdgeAddressT} from "../core/graph"; -import {type EdgeWeight} from "./weights"; +import {type EdgeWeight} from "../core/weights"; /** * This module defines `NodeType`s and `EdgeType`s, both of which are diff --git a/src/analysis/weightEvaluator.js b/src/analysis/weightEvaluator.js index 028f166..81d80c6 100644 --- a/src/analysis/weightEvaluator.js +++ b/src/analysis/weightEvaluator.js @@ -2,8 +2,12 @@ import type {NodeAddressT, EdgeAddressT} from "../core/graph"; import type {NodeType, EdgeType} from "./types"; -import type {Weights as WeightsT, EdgeWeight, NodeWeight} from "./weights"; -import * as Weights from "./weights"; +import type { + Weights as WeightsT, + EdgeWeight, + NodeWeight, +} from "../core/weights"; +import * as Weights from "../core/weights"; import {NodeTrie, EdgeTrie} from "../core/trie"; export type NodeWeightEvaluator = (NodeAddressT) => NodeWeight; diff --git a/src/analysis/weightEvaluator.test.js b/src/analysis/weightEvaluator.test.js index f5fdd34..1b96b96 100644 --- a/src/analysis/weightEvaluator.test.js +++ b/src/analysis/weightEvaluator.test.js @@ -3,7 +3,7 @@ import deepFreeze from "deep-freeze"; import {NodeAddress, EdgeAddress} from "../core/graph"; import {nodeWeightEvaluator, edgeWeightEvaluator} from "./weightEvaluator"; -import {defaultWeights} from "./weights"; +import {defaultWeights} from "../core/weights"; describe("src/analysis/weightEvaluator", () => { describe("nodeWeightEvaluator", () => { diff --git a/src/analysis/weightsToEdgeEvaluator.js b/src/analysis/weightsToEdgeEvaluator.js index c6171a6..88b0db8 100644 --- a/src/analysis/weightsToEdgeEvaluator.js +++ b/src/analysis/weightsToEdgeEvaluator.js @@ -2,7 +2,7 @@ import type {Edge} from "../core/graph"; import type {NodeAndEdgeTypes} from "./types"; -import type {Weights} from "./weights"; +import type {Weights} from "../core/weights"; import type {EdgeEvaluator} from "./pagerank"; import {nodeWeightEvaluator, edgeWeightEvaluator} from "./weightEvaluator"; diff --git a/src/analysis/weightsToEdgeEvaluator.test.js b/src/analysis/weightsToEdgeEvaluator.test.js index 96a0d76..4dda738 100644 --- a/src/analysis/weightsToEdgeEvaluator.test.js +++ b/src/analysis/weightsToEdgeEvaluator.test.js @@ -2,7 +2,7 @@ import deepFreeze from "deep-freeze"; import {NodeAddress, EdgeAddress} from "../core/graph"; -import {type Weights, defaultWeights} from "./weights"; +import {type Weights, defaultWeights} from "../core/weights"; import {weightsToEdgeEvaluator} from "./weightsToEdgeEvaluator"; describe("analysis/weightsToEdgeEvaluator", () => { diff --git a/src/api/load.test.js b/src/api/load.test.js index e38989c..fe8f85e 100644 --- a/src/api/load.test.js +++ b/src/api/load.test.js @@ -16,7 +16,7 @@ import { loadProject, } from "../core/project_io"; import {makeRepoId} from "../plugins/github/repoId"; -import {defaultWeights} from "../analysis/weights"; +import {defaultWeights} from "../core/weights"; import {NodeAddress, Graph} from "../core/graph"; import {node} from "../core/graphTestUtil"; import {TestTaskReporter} from "../util/taskReporter"; diff --git a/src/cli/common.js b/src/cli/common.js index 35aecc3..67cae17 100644 --- a/src/cli/common.js +++ b/src/cli/common.js @@ -5,7 +5,7 @@ import os from "os"; import path from "path"; import deepFreeze from "deep-freeze"; import fs from "fs-extra"; -import {type Weights, fromJSON as weightsFromJSON} from "../analysis/weights"; +import {type Weights, fromJSON as weightsFromJSON} from "../core/weights"; import {validateToken, type GithubToken} from "../plugins/github/token"; export type PluginName = "git" | "github"; diff --git a/src/cli/common.test.js b/src/cli/common.test.js index 617958e..de61643 100644 --- a/src/cli/common.test.js +++ b/src/cli/common.test.js @@ -3,7 +3,7 @@ import path from "path"; import tmp from "tmp"; import fs from "fs-extra"; -import {defaultWeights, toJSON as weightsToJSON} from "../analysis/weights"; +import {defaultWeights, toJSON as weightsToJSON} from "../core/weights"; import {NodeAddress} from "../core/graph"; import {validateToken} from "../plugins/github/token"; diff --git a/src/cli/discourse.js b/src/cli/discourse.js index e305491..14827b5 100644 --- a/src/cli/discourse.js +++ b/src/cli/discourse.js @@ -7,7 +7,7 @@ import dedent from "../util/dedent"; import {LoggingTaskReporter} from "../util/taskReporter"; import type {Command} from "./command"; import * as Common from "./common"; -import {defaultWeights} from "../analysis/weights"; +import {defaultWeights} from "../core/weights"; import {load} from "../api/load"; import {declaration as discourseDeclaration} from "../plugins/discourse/declaration"; import {type Project, createProject} from "../core/project"; diff --git a/src/cli/load.js b/src/cli/load.js index 9a8c2e9..c218696 100644 --- a/src/cli/load.js +++ b/src/cli/load.js @@ -5,7 +5,7 @@ import dedent from "../util/dedent"; import {LoggingTaskReporter} from "../util/taskReporter"; import type {Command} from "./command"; import * as Common from "./common"; -import {defaultWeights, fromJSON as weightsFromJSON} from "../analysis/weights"; +import {defaultWeights, fromJSON as weightsFromJSON} from "../core/weights"; import {projectFromJSON} from "../core/project"; import {load} from "../api/load"; import {specToProject} from "../plugins/github/specToProject"; diff --git a/src/cli/load.test.js b/src/cli/load.test.js index 10cd54d..a6b1033 100644 --- a/src/cli/load.test.js +++ b/src/cli/load.test.js @@ -8,7 +8,7 @@ import {NodeAddress} from "../core/graph"; import {run} from "./testUtil"; import loadCommand, {help} from "./load"; import type {LoadOptions} from "../api/load"; -import {defaultWeights, toJSON as weightsToJSON} from "../analysis/weights"; +import {defaultWeights, toJSON as weightsToJSON} from "../core/weights"; import * as Common from "./common"; import {defaultParams, partialParams} from "../analysis/timeline/params"; import {declaration as githubDeclaration} from "../plugins/github/declaration"; diff --git a/src/analysis/weights.js b/src/core/weights.js similarity index 100% rename from src/analysis/weights.js rename to src/core/weights.js diff --git a/src/analysis/weights.test.js b/src/core/weights.test.js similarity index 98% rename from src/analysis/weights.test.js rename to src/core/weights.test.js index 446e86d..7164c62 100644 --- a/src/analysis/weights.test.js +++ b/src/core/weights.test.js @@ -4,7 +4,7 @@ import stringify from "json-stable-stringify"; import {NodeAddress, EdgeAddress} from "../core/graph"; import {toJSON, fromJSON, defaultWeights, copy} from "./weights"; -describe("analysis/weights", () => { +describe("core/weights", () => { it("copy makes a copy", () => { const w = defaultWeights(); const w1 = copy(w); diff --git a/src/explorer/TimelineExplorer.js b/src/explorer/TimelineExplorer.js index b1d68bf..7870690 100644 --- a/src/explorer/TimelineExplorer.js +++ b/src/explorer/TimelineExplorer.js @@ -2,7 +2,7 @@ import React from "react"; import deepEqual from "lodash.isequal"; -import {type Weights, copy as weightsCopy} from "../analysis/weights"; +import {type Weights, copy as weightsCopy} from "../core/weights"; import {type NodeAddressT} from "../core/graph"; import {TimelineCred} from "../analysis/timeline/timelineCred"; import {type TimelineCredParameters} from "../analysis/timeline/params"; diff --git a/src/explorer/legacy/App.js b/src/explorer/legacy/App.js index e5aef20..08f81df 100644 --- a/src/explorer/legacy/App.js +++ b/src/explorer/legacy/App.js @@ -12,7 +12,7 @@ import {type NodeAddressT} from "../../core/graph"; import {PagerankTable} from "./pagerankTable/Table"; import {WeightConfig} from "../weights/WeightConfig"; import {WeightsFileManager} from "../weights/WeightsFileManager"; -import {type Weights, defaultWeights} from "../../analysis/weights"; +import {type Weights, defaultWeights} from "../../core/weights"; import {Prefix as GithubPrefix} from "../../plugins/github/nodes"; import { createStateTransitionMachine, diff --git a/src/explorer/legacy/state.js b/src/explorer/legacy/state.js index b222435..6a435c3 100644 --- a/src/explorer/legacy/state.js +++ b/src/explorer/legacy/state.js @@ -13,7 +13,7 @@ import { } from "../../analysis/pagerank"; import {TimelineCred} from "../../analysis/timeline/timelineCred"; -import type {Weights} from "../../analysis/weights"; +import type {Weights} from "../../core/weights"; import {weightsToEdgeEvaluator} from "../../analysis/weightsToEdgeEvaluator"; import {combineTypes} from "../../analysis/pluginDeclaration"; diff --git a/src/explorer/legacy/state.test.js b/src/explorer/legacy/state.test.js index 6a3b82e..922f171 100644 --- a/src/explorer/legacy/state.test.js +++ b/src/explorer/legacy/state.test.js @@ -5,7 +5,7 @@ import {StateTransitionMachine, type AppState} from "./state"; import {Graph, NodeAddress} from "../../core/graph"; import {Assets} from "../../webutil/assets"; import {type EdgeEvaluator} from "../../analysis/pagerank"; -import {defaultWeights} from "../../analysis/weights"; +import {defaultWeights} from "../../core/weights"; import type { PagerankNodeDecomposition, PagerankOptions, diff --git a/src/explorer/weights/EdgeTypeConfig.js b/src/explorer/weights/EdgeTypeConfig.js index 117fb2a..e2bde00 100644 --- a/src/explorer/weights/EdgeTypeConfig.js +++ b/src/explorer/weights/EdgeTypeConfig.js @@ -4,7 +4,7 @@ import React from "react"; import {WeightSlider, type Props as WeightSliderProps} from "./WeightSlider"; import type {EdgeType} from "../../analysis/types"; -import type {EdgeWeight} from "../../analysis/weights"; +import type {EdgeWeight} from "../../core/weights"; export class EdgeTypeConfig extends React.Component<{ +weight: EdgeWeight, diff --git a/src/explorer/weights/NodeTypeConfig.js b/src/explorer/weights/NodeTypeConfig.js index 1e32ff4..8905256 100644 --- a/src/explorer/weights/NodeTypeConfig.js +++ b/src/explorer/weights/NodeTypeConfig.js @@ -3,7 +3,7 @@ import React from "react"; import {WeightSlider} from "./WeightSlider"; import type {NodeType} from "../../analysis/types"; -import type {NodeWeight} from "../../analysis/weights"; +import type {NodeWeight} from "../../core/weights"; export class NodeTypeConfig extends React.Component<{ +weight: NodeWeight, diff --git a/src/explorer/weights/WeightConfig.js b/src/explorer/weights/WeightConfig.js index a99cabc..06750e8 100644 --- a/src/explorer/weights/WeightConfig.js +++ b/src/explorer/weights/WeightConfig.js @@ -4,7 +4,7 @@ import React from "react"; import * as NullUtil from "../../util/null"; import {type NodeAddressT, type EdgeAddressT} from "../../core/graph"; -import {type EdgeWeight, type NodeWeight} from "../../analysis/weights"; +import {type EdgeWeight, type NodeWeight} from "../../core/weights"; import {type NodeType, type EdgeType} from "../../analysis/types"; import type {PluginDeclaration} from "../../analysis/pluginDeclaration"; import {NodeTypeConfig} from "./NodeTypeConfig"; diff --git a/src/explorer/weights/WeightsFileManager.js b/src/explorer/weights/WeightsFileManager.js index f1b766b..bada889 100644 --- a/src/explorer/weights/WeightsFileManager.js +++ b/src/explorer/weights/WeightsFileManager.js @@ -5,7 +5,7 @@ import React from "react"; import {FileUploader} from "../../util/FileUploader"; import Link from "../../webutil/Link"; import {MdFileDownload, MdFileUpload} from "react-icons/md"; -import {type Weights, toJSON, fromJSON} from "../../analysis/weights"; +import {type Weights, toJSON, fromJSON} from "../../core/weights"; export type Props = {| +weights: Weights,