Skip to content

Commit c1eb54f

Browse files
committed
small changes to config files
1 parent 2ce8928 commit c1eb54f

File tree

25 files changed

+62
-141
lines changed

25 files changed

+62
-141
lines changed
-817 KB
Binary file not shown.

scripts/local_workflows/run_grn_evaluation.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
# set -e
66
# Default parameters
7-
RUN_CONSENSUS=false
8-
RUN_METRICS=false
7+
RUN_CONSENSUS=true
8+
RUN_METRICS=true
99
PROCESS_RESULTS=false
1010
TEMP_DIR="output/evaluation"
1111
RESULTS_FILE="resources/results/all_scores.csv"

scripts/prior/run_consensus.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ printf '%s\n' "${predictions[@]}"
6767
echo "Running consensus for Regression"
6868
datasets=(${DATASET})
6969
for dataset in "${datasets[@]}"; do
70-
echo "Running reg2 consensus for dataset: $dataset"
70+
echo "Running regression consensus for dataset: $dataset"
7171

7272
python src/metrics/regression/consensus/script.py \
7373
--dataset "$dataset" \

scripts/repo/run_pc_vs_nc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
subsamples=(-2 -3 -4)
66

7-
RUN_ID="robust_analy_reg2_$1"
7+
RUN_ID="robust_analy_regression_$1"
88
# resources_dir="resources"
99
resources_dir="s3://openproblems-data/resources/grn"
1010

src/metrics/all_metrics/config.novsh.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ resources:
2222
dest: tf_recovery_helper.py
2323
- path: /src/metrics/tf_binding/helper.py
2424
dest: tf_binding_helper.py
25-
- path: /src/metrics/replica_consistency/helper.py
26-
dest: replica_consistency_helper.py
25+
- path: /src/metrics/replicate_consistency/helper.py
26+
dest: replicate_consistency_helper.py
2727
- path: /src/utils/config.py
2828
dest: config.py
2929

src/metrics/all_metrics/helper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# from anchor_regression.helper import main as anchor_regression
1414
from tf_recovery.helper import main as tf_recovery
1515
from tf_binding.helper import main as tf_binding
16-
from rc_tf_act.helper import main as rc_tf_act
16+
from replicate_consistency.helper import main as replicate_consistency
1717
from vc.helper import main as vc
1818
from gs_recovery.helper import main as gs_recovery
1919

@@ -26,7 +26,7 @@
2626
# 'anchor_regression': anchor_regression,
2727
'tf_recovery': tf_recovery,
2828
'tf_binding': tf_binding,
29-
'rc_tf_act': rc_tf_act,
29+
'replicate_consistency': replicate_consistency,
3030
'vc': vc,
3131
'gs_recovery': gs_recovery,
3232
}

src/metrics/experimental/rc/config.novsh.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
__merge__: ../../api/comp_metric.yaml
22

3-
name: replica_consistency
3+
name: replicate_consistency
44
namespace: "metrics"
55
info:
6-
label: Replica consistency
6+
label: Replicate consistency
77
summary: Calculates replica consistency scores
88

99

src/metrics/experimental/rc/helper.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,20 +305,20 @@ def main(par):
305305
tgtg_score_lift = np.mean([score_lift for score_lift, score in tgtg_results])
306306
# final_score = (tftg_score + tgtg_score + tftg_tgtg_score) / 3.0
307307
if True:
308-
replica_consistency_precision = np.mean([tftg_score_lift, tgtg_score_lift])
309-
replica_consistency_balanced = np.mean([tftg_score, tgtg_score])
308+
replicate_consistency_precision = np.mean([tftg_score_lift, tgtg_score_lift])
309+
replicate_consistency_balanced = np.mean([tftg_score, tgtg_score])
310310
else:
311-
replica_consistency_precision = tgtg_score_lift
312-
replica_consistency_balanced = tgtg_score
311+
replicate_consistency_precision = tgtg_score_lift
312+
replicate_consistency_balanced = tgtg_score
313313

314314
# Create results DataFrame with all three scores
315315
results = pd.DataFrame({
316316
# 'tftg': [tftg_score],
317317
# 'tftg_score_lift': [tftg_score_lift],
318318
# 'tgtg': [tgtg_score],
319319
# 'tgtg_score_lift': [tgtg_score_lift],
320-
'rc_precision': [replica_consistency_precision],
321-
'rc_balanced': [replica_consistency_balanced],
320+
'rc_precision': [replicate_consistency_precision],
321+
'rc_balanced': [replicate_consistency_balanced],
322322
})
323323
print(results)
324324

src/metrics/rc_tf_act/README.md

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)